Commit 3426b8ed authored by Ben Laurie's avatar Ben Laurie
Browse files

Avoid collisions.

parent f5cd3db5

test/tcrl

+24 −24
Original line number Diff line number Diff line
@@ -9,70 +9,70 @@ else 
fi



echo testing crl conversions

cp $t fff.p

cp $t crl-fff.p



echo "p -> d"

$cmd -in fff.p -inform p -outform d >f.d

$cmd -in crl-fff.p -inform p -outform d >crl-f.d

if [ $? != 0 ]; then exit 1; fi

#echo "p -> t"

#$cmd -in fff.p -inform p -outform t >f.t

#$cmd -in crl-fff.p -inform p -outform t >crl-f.t

#if [ $? != 0 ]; then exit 1; fi

echo "p -> p"

$cmd -in fff.p -inform p -outform p >f.p

$cmd -in crl-fff.p -inform p -outform p >crl-f.p

if [ $? != 0 ]; then exit 1; fi



echo "d -> d"

$cmd -in f.d -inform d -outform d >ff.d1

$cmd -in crl-f.d -inform d -outform d >crl-ff.d1

if [ $? != 0 ]; then exit 1; fi

#echo "t -> d"

#$cmd -in f.t -inform t -outform d >ff.d2

#$cmd -in crl-f.t -inform t -outform d >crl-ff.d2

#if [ $? != 0 ]; then exit 1; fi

echo "p -> d"

$cmd -in f.p -inform p -outform d >ff.d3

$cmd -in crl-f.p -inform p -outform d >crl-ff.d3

if [ $? != 0 ]; then exit 1; fi



#echo "d -> t"

#$cmd -in f.d -inform d -outform t >ff.t1

#$cmd -in crl-f.d -inform d -outform t >crl-ff.t1

#if [ $? != 0 ]; then exit 1; fi

#echo "t -> t"

#$cmd -in f.t -inform t -outform t >ff.t2

#$cmd -in crl-f.t -inform t -outform t >crl-ff.t2

#if [ $? != 0 ]; then exit 1; fi

#echo "p -> t"

#$cmd -in f.p -inform p -outform t >ff.t3

#$cmd -in crl-f.p -inform p -outform t >crl-ff.t3

#if [ $? != 0 ]; then exit 1; fi



echo "d -> p"

$cmd -in f.d -inform d -outform p >ff.p1

$cmd -in crl-f.d -inform d -outform p >crl-ff.p1

if [ $? != 0 ]; then exit 1; fi

#echo "t -> p"

#$cmd -in f.t -inform t -outform p >ff.p2

#$cmd -in crl-f.t -inform t -outform p >crl-ff.p2

#if [ $? != 0 ]; then exit 1; fi

echo "p -> p"

$cmd -in f.p -inform p -outform p >ff.p3

$cmd -in crl-f.p -inform p -outform p >crl-ff.p3

if [ $? != 0 ]; then exit 1; fi



cmp fff.p f.p

cmp crl-fff.p crl-f.p

if [ $? != 0 ]; then exit 1; fi

cmp fff.p ff.p1

cmp crl-fff.p crl-ff.p1

if [ $? != 0 ]; then exit 1; fi

#cmp fff.p ff.p2

#cmp crl-fff.p crl-ff.p2

#if [ $? != 0 ]; then exit 1; fi

cmp fff.p ff.p3

cmp crl-fff.p crl-ff.p3

if [ $? != 0 ]; then exit 1; fi



#cmp f.t ff.t1

#cmp crl-f.t crl-ff.t1

#if [ $? != 0 ]; then exit 1; fi

#cmp f.t ff.t2

#cmp crl-f.t crl-ff.t2

#if [ $? != 0 ]; then exit 1; fi

#cmp f.t ff.t3

#cmp crl-f.t crl-ff.t3

#if [ $? != 0 ]; then exit 1; fi



cmp f.p ff.p1

cmp crl-f.p crl-ff.p1

if [ $? != 0 ]; then exit 1; fi

#cmp f.p ff.p2

#cmp crl-f.p crl-ff.p2

#if [ $? != 0 ]; then exit 1; fi

cmp f.p ff.p3

cmp crl-f.p crl-ff.p3

if [ $? != 0 ]; then exit 1; fi



/bin/rm -f f.* ff.* fff.*

/bin/rm -f crl-f.* crl-ff.* crl-fff.*

exit 0

test/tpkcs7

+13 −13
Original line number Diff line number Diff line
@@ -9,40 +9,40 @@ else 
fi



echo testing pkcs7 conversions

cp $t fff.p

cp $t p7-fff.p



echo "p -> d"

$cmd -in fff.p -inform p -outform d >f.d

$cmd -in p7-fff.p -inform p -outform d >p7-f.d

if [ $? != 0 ]; then exit 1; fi

echo "p -> p"

$cmd -in fff.p -inform p -outform p >f.p

$cmd -in p7-fff.p -inform p -outform p >p7-f.p

if [ $? != 0 ]; then exit 1; fi



echo "d -> d"

$cmd -in f.d -inform d -outform d >ff.d1

$cmd -in p7-f.d -inform d -outform d >p7-ff.d1

if [ $? != 0 ]; then exit 1; fi

echo "p -> d"

$cmd -in f.p -inform p -outform d >ff.d3

$cmd -in p7-f.p -inform p -outform d >p7-ff.d3

if [ $? != 0 ]; then exit 1; fi



echo "d -> p"

$cmd -in f.d -inform d -outform p >ff.p1

$cmd -in p7-f.d -inform d -outform p >p7-ff.p1

if [ $? != 0 ]; then exit 1; fi

echo "p -> p"

$cmd -in f.p -inform p -outform p >ff.p3

$cmd -in p7-f.p -inform p -outform p >p7-ff.p3

if [ $? != 0 ]; then exit 1; fi



cmp fff.p f.p

cmp p7-fff.p p7-f.p

if [ $? != 0 ]; then exit 1; fi

cmp fff.p ff.p1

cmp p7-fff.p p7-ff.p1

if [ $? != 0 ]; then exit 1; fi

cmp fff.p ff.p3

cmp p7-fff.p p7-ff.p3

if [ $? != 0 ]; then exit 1; fi



cmp f.p ff.p1

cmp p7-f.p p7-ff.p1

if [ $? != 0 ]; then exit 1; fi

cmp f.p ff.p3

cmp p7-f.p p7-ff.p3

if [ $? != 0 ]; then exit 1; fi



/bin/rm -f f.* ff.* fff.*

/bin/rm -f p7-f.* p7-ff.* p7-fff.*

exit 0

test/tpkcs7d

+10 −10
Original line number Diff line number Diff line
@@ -9,33 +9,33 @@ else 
fi



echo "testing pkcs7 conversions (2)"

cp $t fff.p

cp $t p7d-fff.p



echo "p -> d"

$cmd -in fff.p -inform p -outform d >f.d

$cmd -in p7d-fff.p -inform p -outform d >p7d-f.d

if [ $? != 0 ]; then exit 1; fi

echo "p -> p"

$cmd -in fff.p -inform p -outform p >f.p

$cmd -in p7d-fff.p -inform p -outform p >p7d-f.p

if [ $? != 0 ]; then exit 1; fi



echo "d -> d"

$cmd -in f.d -inform d -outform d >ff.d1

$cmd -in p7d-f.d -inform d -outform d >p7d-ff.d1

if [ $? != 0 ]; then exit 1; fi

echo "p -> d"

$cmd -in f.p -inform p -outform d >ff.d3

$cmd -in p7d-f.p -inform p -outform d >p7d-ff.d3

if [ $? != 0 ]; then exit 1; fi



echo "d -> p"

$cmd -in f.d -inform d -outform p >ff.p1

$cmd -in p7d-f.d -inform d -outform p >p7d-ff.p1

if [ $? != 0 ]; then exit 1; fi

echo "p -> p"

$cmd -in f.p -inform p -outform p >ff.p3

$cmd -in p7d-f.p -inform p -outform p >p7d-ff.p3

if [ $? != 0 ]; then exit 1; fi



cmp f.p ff.p1

cmp p7d-f.p p7d-ff.p1

if [ $? != 0 ]; then exit 1; fi

cmp f.p ff.p3

cmp p7d-f.p p7d-ff.p3

if [ $? != 0 ]; then exit 1; fi



/bin/rm -f f.* ff.* fff.*

/bin/rm -f p7d-f.* p7d-ff.* p7d-fff.*

exit 0

test/treq

+24 −24
Original line number Diff line number Diff line
@@ -14,70 +14,70 @@ if $cmd -in $t -inform p -noout -text 2>&1 | fgrep -i 'Unknown Public Key'; then 
fi



echo testing req conversions

cp $t fff.p

cp $t req-fff.p



echo "p -> d"

$cmd -in fff.p -inform p -outform d >f.d

$cmd -in req-fff.p -inform p -outform d >req-f.d

if [ $? != 0 ]; then exit 1; fi

#echo "p -> t"

#$cmd -in fff.p -inform p -outform t >f.t

#$cmd -in req-fff.p -inform p -outform t >req-f.t

#if [ $? != 0 ]; then exit 1; fi

echo "p -> p"

$cmd -in fff.p -inform p -outform p >f.p

$cmd -in req-fff.p -inform p -outform p >req-f.p

if [ $? != 0 ]; then exit 1; fi



echo "d -> d"

$cmd -verify -in f.d -inform d -outform d >ff.d1

$cmd -verify -in req-f.d -inform d -outform d >req-ff.d1

if [ $? != 0 ]; then exit 1; fi

#echo "t -> d"

#$cmd -in f.t -inform t -outform d >ff.d2

#$cmd -in req-f.t -inform t -outform d >req-ff.d2

#if [ $? != 0 ]; then exit 1; fi

echo "p -> d"

$cmd -verify -in f.p -inform p -outform d >ff.d3

$cmd -verify -in req-f.p -inform p -outform d >req-ff.d3

if [ $? != 0 ]; then exit 1; fi



#echo "d -> t"

#$cmd -in f.d -inform d -outform t >ff.t1

#$cmd -in req-f.d -inform d -outform t >req-ff.t1

#if [ $? != 0 ]; then exit 1; fi

#echo "t -> t"

#$cmd -in f.t -inform t -outform t >ff.t2

#$cmd -in req-f.t -inform t -outform t >req-ff.t2

#if [ $? != 0 ]; then exit 1; fi

#echo "p -> t"

#$cmd -in f.p -inform p -outform t >ff.t3

#$cmd -in req-f.p -inform p -outform t >req-ff.t3

#if [ $? != 0 ]; then exit 1; fi



echo "d -> p"

$cmd -in f.d -inform d -outform p >ff.p1

$cmd -in req-f.d -inform d -outform p >req-ff.p1

if [ $? != 0 ]; then exit 1; fi

#echo "t -> p"

#$cmd -in f.t -inform t -outform p >ff.p2

#$cmd -in req-f.t -inform t -outform p >req-ff.p2

#if [ $? != 0 ]; then exit 1; fi

echo "p -> p"

$cmd -in f.p -inform p -outform p >ff.p3

$cmd -in req-f.p -inform p -outform p >req-ff.p3

if [ $? != 0 ]; then exit 1; fi



cmp fff.p f.p

cmp req-fff.p req-f.p

if [ $? != 0 ]; then exit 1; fi

cmp fff.p ff.p1

cmp req-fff.p req-ff.p1

if [ $? != 0 ]; then exit 1; fi

#cmp fff.p ff.p2

#cmp req-fff.p req-ff.p2

#if [ $? != 0 ]; then exit 1; fi

cmp fff.p ff.p3

cmp req-fff.p req-ff.p3

if [ $? != 0 ]; then exit 1; fi



#cmp f.t ff.t1

#cmp req-f.t req-ff.t1

#if [ $? != 0 ]; then exit 1; fi

#cmp f.t ff.t2

#cmp req-f.t req-ff.t2

#if [ $? != 0 ]; then exit 1; fi

#cmp f.t ff.t3

#cmp req-f.t req-ff.t3

#if [ $? != 0 ]; then exit 1; fi



cmp f.p ff.p1

cmp req-f.p req-ff.p1

if [ $? != 0 ]; then exit 1; fi

#cmp f.p ff.p2

#cmp req-f.p req-ff.p2

#if [ $? != 0 ]; then exit 1; fi

cmp f.p ff.p3

cmp req-f.p req-ff.p3

if [ $? != 0 ]; then exit 1; fi



/bin/rm -f f.* ff.* fff.*

/bin/rm -f req-f.* req-ff.* req-fff.*

exit 0

test/trsa

+24 −24
Original line number Diff line number Diff line
@@ -14,70 +14,70 @@ else 
fi



echo testing rsa conversions

cp $t fff.p

cp $t rsa-fff.p



echo "p -> d"

$cmd -in fff.p -inform p -outform d >f.d

$cmd -in rsa-fff.p -inform p -outform d >rsa-f.d

if [ $? != 0 ]; then exit 1; fi

#echo "p -> t"

#$cmd -in fff.p -inform p -outform t >f.t

#$cmd -in rsa-fff.p -inform p -outform t >rsa-f.t

#if [ $? != 0 ]; then exit 1; fi

echo "p -> p"

$cmd -in fff.p -inform p -outform p >f.p

$cmd -in rsa-fff.p -inform p -outform p >rsa-f.p

if [ $? != 0 ]; then exit 1; fi



echo "d -> d"

$cmd -in f.d -inform d -outform d >ff.d1

$cmd -in rsa-f.d -inform d -outform d >rsa-ff.d1

if [ $? != 0 ]; then exit 1; fi

#echo "t -> d"

#$cmd -in f.t -inform t -outform d >ff.d2

#$cmd -in rsa-f.t -inform t -outform d >rsa-ff.d2

#if [ $? != 0 ]; then exit 1; fi

echo "p -> d"

$cmd -in f.p -inform p -outform d >ff.d3

$cmd -in rsa-f.p -inform p -outform d >rsa-ff.d3

if [ $? != 0 ]; then exit 1; fi



#echo "d -> t"

#$cmd -in f.d -inform d -outform t >ff.t1

#$cmd -in rsa-f.d -inform d -outform t >rsa-ff.t1

#if [ $? != 0 ]; then exit 1; fi

#echo "t -> t"

#$cmd -in f.t -inform t -outform t >ff.t2

#$cmd -in rsa-f.t -inform t -outform t >rsa-ff.t2

#if [ $? != 0 ]; then exit 1; fi

#echo "p -> t"

#$cmd -in f.p -inform p -outform t >ff.t3

#$cmd -in rsa-f.p -inform p -outform t >rsa-ff.t3

#if [ $? != 0 ]; then exit 1; fi



echo "d -> p"

$cmd -in f.d -inform d -outform p >ff.p1

$cmd -in rsa-f.d -inform d -outform p >rsa-ff.p1

if [ $? != 0 ]; then exit 1; fi

#echo "t -> p"

#$cmd -in f.t -inform t -outform p >ff.p2

#$cmd -in rsa-f.t -inform t -outform p >rsa-ff.p2

#if [ $? != 0 ]; then exit 1; fi

echo "p -> p"

$cmd -in f.p -inform p -outform p >ff.p3

$cmd -in rsa-f.p -inform p -outform p >rsa-ff.p3

if [ $? != 0 ]; then exit 1; fi



cmp fff.p f.p

cmp rsa-fff.p rsa-f.p

if [ $? != 0 ]; then exit 1; fi

cmp fff.p ff.p1

cmp rsa-fff.p rsa-ff.p1

if [ $? != 0 ]; then exit 1; fi

#cmp fff.p ff.p2

#cmp rsa-fff.p rsa-ff.p2

#if [ $? != 0 ]; then exit 1; fi

cmp fff.p ff.p3

cmp rsa-fff.p rsa-ff.p3

if [ $? != 0 ]; then exit 1; fi



#cmp f.t ff.t1

#cmp rsa-f.t rsa-ff.t1

#if [ $? != 0 ]; then exit 1; fi

#cmp f.t ff.t2

#cmp rsa-f.t rsa-ff.t2

#if [ $? != 0 ]; then exit 1; fi

#cmp f.t ff.t3

#cmp rsa-f.t rsa-ff.t3

#if [ $? != 0 ]; then exit 1; fi



cmp f.p ff.p1

cmp rsa-f.p rsa-ff.p1

if [ $? != 0 ]; then exit 1; fi

#cmp f.p ff.p2

#cmp rsa-f.p rsa-ff.p2

#if [ $? != 0 ]; then exit 1; fi

cmp f.p ff.p3

cmp rsa-f.p rsa-ff.p3

if [ $? != 0 ]; then exit 1; fi



/bin/rm -f f.* ff.* fff.*

/bin/rm -f rsa-f.* rsa-ff.* rsa-fff.*

exit 0