Avoid collisions.

diff --git a/test/tcrl b/test/tcrl
index 055269eab8ddc8e99dc725061de065926ec9c594..1075a4f3f502e3c5fd663775b7598b0b49d63920 100644 (file)
--- a/test/tcrl
+++ b/test/tcrl
@@ -9,70 +9,70 @@ else
 fi
 
 echo testing crl conversions
 fi
 
 echo testing crl conversions

-cp $t fff.p
+cp $t crl-fff.p

 
 echo "p -> d"
 
 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"
 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"
 #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"
 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"
 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"
 #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"
 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"
 #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"
 #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"
 #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"
 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"
 #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
 
 if [ $? != 0 ]; then exit 1; fi
 

-cmp fff.p f.p
+cmp crl-fff.p crl-f.p

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

-cmp fff.p ff.p1
+cmp crl-fff.p crl-ff.p1

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

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

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

-cmp fff.p ff.p3
+cmp crl-fff.p crl-ff.p3

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

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

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

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

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

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

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

-cmp f.p ff.p1
+cmp crl-f.p crl-ff.p1

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

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

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

-cmp f.p ff.p3
+cmp crl-f.p crl-ff.p3

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

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

 exit 0
 exit 0

diff --git a/test/tpkcs7 b/test/tpkcs7
index 3e435ffbf9fd837c30f97831a5a0e6c4e612564f..d7029a03268b3f06ebcc813853888fd3796321bc 100644 (file)
--- a/test/tpkcs7
+++ b/test/tpkcs7
@@ -9,40 +9,40 @@ else
 fi
 
 echo testing pkcs7 conversions
 fi
 
 echo testing pkcs7 conversions

-cp $t fff.p
+cp $t p7-fff.p

 
 echo "p -> d"
 
 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"
 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"
 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"
 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"
 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"
 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
 
 if [ $? != 0 ]; then exit 1; fi
 

-cmp fff.p f.p
+cmp p7-fff.p p7-f.p

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

-cmp fff.p ff.p1
+cmp p7-fff.p p7-ff.p1

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

-cmp fff.p ff.p3
+cmp p7-fff.p p7-ff.p3

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

-cmp f.p ff.p1
+cmp p7-f.p p7-ff.p1

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

-cmp f.p ff.p3
+cmp p7-f.p p7-ff.p3

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

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

 exit 0
 exit 0

diff --git a/test/tpkcs7d b/test/tpkcs7d
index 64fc28e88f0b3ce044b5e70859e4653e1d8e0512..d4bfbdf1cd6d647b8db60d5f80a4056f7af0e16b 100644 (file)
--- a/test/tpkcs7d
+++ b/test/tpkcs7d
@@ -9,33 +9,33 @@ else
 fi
 
 echo "testing pkcs7 conversions (2)"
 fi
 
 echo "testing pkcs7 conversions (2)"

-cp $t fff.p
+cp $t p7d-fff.p

 
 echo "p -> d"
 
 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"
 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"
 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"
 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"
 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"
 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
 
 if [ $? != 0 ]; then exit 1; fi
 

-cmp f.p ff.p1
+cmp p7d-f.p p7d-ff.p1

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

-cmp f.p ff.p3
+cmp p7d-f.p p7d-ff.p3

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

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

 exit 0
 exit 0

diff --git a/test/treq b/test/treq
index 77f37dcf3a9a54037a7114ee5951d53f4ca7dd4a..420d25e16899f9e057b20ab3165a4f53422c038e 100644 (file)
--- a/test/treq
+++ b/test/treq
@@ -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
 fi
 
 echo testing req conversions

-cp $t fff.p
+cp $t req-fff.p

 
 echo "p -> d"
 
 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"
 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"
 #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"
 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"
 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"
 #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"
 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"
 #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"
 #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"
 #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"
 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"
 #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
 
 if [ $? != 0 ]; then exit 1; fi
 

-cmp fff.p f.p
+cmp req-fff.p req-f.p

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

-cmp fff.p ff.p1
+cmp req-fff.p req-ff.p1

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

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

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

-cmp fff.p ff.p3
+cmp req-fff.p req-ff.p3

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

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

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

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

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

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

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

-cmp f.p ff.p1
+cmp req-f.p req-ff.p1

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

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

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

-cmp f.p ff.p3
+cmp req-f.p req-ff.p3

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

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

 exit 0
 exit 0

diff --git a/test/trsa b/test/trsa
index 249ac1ddcc6b4d3975c5bcadfd0a1f4d70b1dc06..5a2290f8cc15dbbac10d63724028def07e6656b0 100644 (file)
--- a/test/trsa
+++ b/test/trsa
@@ -14,70 +14,70 @@ else
 fi
 
 echo testing rsa conversions
 fi
 
 echo testing rsa conversions

-cp $t fff.p
+cp $t rsa-fff.p

 
 echo "p -> d"
 
 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"
 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"
 #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"
 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"
 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"
 #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"
 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"
 #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"
 #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"
 #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"
 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"
 #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
 
 if [ $? != 0 ]; then exit 1; fi
 

-cmp fff.p f.p
+cmp rsa-fff.p rsa-f.p

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

-cmp fff.p ff.p1
+cmp rsa-fff.p rsa-ff.p1

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

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

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

-cmp fff.p ff.p3
+cmp rsa-fff.p rsa-ff.p3

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

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

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

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

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

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

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

-cmp f.p ff.p1
+cmp rsa-f.p rsa-ff.p1

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

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

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

-cmp f.p ff.p3
+cmp rsa-f.p rsa-ff.p3

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

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

 exit 0
 exit 0

diff --git a/test/tsid b/test/tsid
index 6adbd531ce0abfe660e187c5d07b6e402e7693ba..e1eb503f085d6e680eefd0e9d0d7184d48c70c42 100644 (file)
--- a/test/tsid
+++ b/test/tsid
@@ -9,70 +9,70 @@ else
 fi
 
 echo testing session-id conversions
 fi
 
 echo testing session-id conversions

-cp $t fff.p
+cp $t sid-fff.p

 
 echo "p -> d"
 
 echo "p -> d"

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

 if [ $? != 0 ]; then exit 1; fi
 #echo "p -> t"
 if [ $? != 0 ]; then exit 1; fi
 #echo "p -> t"

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

 #if [ $? != 0 ]; then exit 1; fi
 echo "p -> p"
 #if [ $? != 0 ]; then exit 1; fi
 echo "p -> p"

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

 if [ $? != 0 ]; then exit 1; fi
 
 echo "d -> d"
 if [ $? != 0 ]; then exit 1; fi
 
 echo "d -> d"

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

 if [ $? != 0 ]; then exit 1; fi
 #echo "t -> d"
 if [ $? != 0 ]; then exit 1; fi
 #echo "t -> d"

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

 #if [ $? != 0 ]; then exit 1; fi
 echo "p -> d"
 #if [ $? != 0 ]; then exit 1; fi
 echo "p -> d"

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

 if [ $? != 0 ]; then exit 1; fi
 
 #echo "d -> t"
 if [ $? != 0 ]; then exit 1; fi
 
 #echo "d -> t"

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

 #if [ $? != 0 ]; then exit 1; fi
 #echo "t -> t"
 #if [ $? != 0 ]; then exit 1; fi
 #echo "t -> t"

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

 #if [ $? != 0 ]; then exit 1; fi
 #echo "p -> t"
 #if [ $? != 0 ]; then exit 1; fi
 #echo "p -> t"

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

 #if [ $? != 0 ]; then exit 1; fi
 
 echo "d -> p"
 #if [ $? != 0 ]; then exit 1; fi
 
 echo "d -> p"

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

 if [ $? != 0 ]; then exit 1; fi
 #echo "t -> p"
 if [ $? != 0 ]; then exit 1; fi
 #echo "t -> p"

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

 #if [ $? != 0 ]; then exit 1; fi
 echo "p -> p"
 #if [ $? != 0 ]; then exit 1; fi
 echo "p -> p"

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

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

-cmp fff.p f.p
+cmp sid-fff.p sid-f.p

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

-cmp fff.p ff.p1
+cmp sid-fff.p sid-ff.p1

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

-#cmp fff.p ff.p2
+#cmp sid-fff.p sid-ff.p2

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

-cmp fff.p ff.p3
+cmp sid-fff.p sid-ff.p3

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

-#cmp f.t ff.t1
+#cmp sid-f.t sid-ff.t1

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

-#cmp f.t ff.t2
+#cmp sid-f.t sid-ff.t2

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

-#cmp f.t ff.t3
+#cmp sid-f.t sid-ff.t3

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

-cmp f.p ff.p1
+cmp sid-f.p sid-ff.p1

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

-#cmp f.p ff.p2
+#cmp sid-f.p sid-ff.p2

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

-cmp f.p ff.p3
+cmp sid-f.p sid-ff.p3

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

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

 exit 0
 exit 0

diff --git a/test/tx509 b/test/tx509
index 4a15b98d17d8ac6ba590ee53b49303f4f44bfc49..0ce3b5223c5bcf4aeb7ef35e97b2c243432c2fec 100644 (file)
--- a/test/tx509
+++ b/test/tx509
@@ -9,70 +9,70 @@ else
 fi
 
 echo testing X509 conversions
 fi
 
 echo testing X509 conversions

-cp $t fff.p
+cp $t x509-fff.p

 
 echo "p -> d"
 
 echo "p -> d"

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

 if [ $? != 0 ]; then exit 1; fi
 echo "p -> n"
 if [ $? != 0 ]; then exit 1; fi
 echo "p -> n"

-$cmd -in fff.p -inform p -outform n >f.n
+$cmd -in x509-fff.p -inform p -outform n >x509-f.n

 if [ $? != 0 ]; then exit 1; fi
 echo "p -> p"
 if [ $? != 0 ]; then exit 1; fi
 echo "p -> p"

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

 if [ $? != 0 ]; then exit 1; fi
 
 echo "d -> d"
 if [ $? != 0 ]; then exit 1; fi
 
 echo "d -> d"

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

 if [ $? != 0 ]; then exit 1; fi
 echo "n -> d"
 if [ $? != 0 ]; then exit 1; fi
 echo "n -> d"

-$cmd -in f.n -inform n -outform d >ff.d2
+$cmd -in x509-f.n -inform n -outform d >x509-ff.d2

 if [ $? != 0 ]; then exit 1; fi
 echo "p -> d"
 if [ $? != 0 ]; then exit 1; fi
 echo "p -> d"

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

 if [ $? != 0 ]; then exit 1; fi
 
 echo "d -> n"
 if [ $? != 0 ]; then exit 1; fi
 
 echo "d -> n"

-$cmd -in f.d -inform d -outform n >ff.n1
+$cmd -in x509-f.d -inform d -outform n >x509-ff.n1

 if [ $? != 0 ]; then exit 1; fi
 echo "n -> n"
 if [ $? != 0 ]; then exit 1; fi
 echo "n -> n"

-$cmd -in f.n -inform n -outform n >ff.n2
+$cmd -in x509-f.n -inform n -outform n >x509-ff.n2

 if [ $? != 0 ]; then exit 1; fi
 echo "p -> n"
 if [ $? != 0 ]; then exit 1; fi
 echo "p -> n"

-$cmd -in f.p -inform p -outform n >ff.n3
+$cmd -in x509-f.p -inform p -outform n >x509-ff.n3

 if [ $? != 0 ]; then exit 1; fi
 
 echo "d -> p"
 if [ $? != 0 ]; then exit 1; fi
 
 echo "d -> p"

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

 if [ $? != 0 ]; then exit 1; fi
 echo "n -> p"
 if [ $? != 0 ]; then exit 1; fi
 echo "n -> p"

-$cmd -in f.n -inform n -outform p >ff.p2
+$cmd -in x509-f.n -inform n -outform p >x509-ff.p2

 if [ $? != 0 ]; then exit 1; fi
 echo "p -> p"
 if [ $? != 0 ]; then exit 1; fi
 echo "p -> p"

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

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

-cmp fff.p f.p
+cmp x509-fff.p x509-f.p

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

-cmp fff.p ff.p1
+cmp x509-fff.p x509-ff.p1

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

-cmp fff.p ff.p2
+cmp x509-fff.p x509-ff.p2

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

-cmp fff.p ff.p3
+cmp x509-fff.p x509-ff.p3

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

-cmp f.n ff.n1
+cmp x509-f.n x509-ff.n1

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

-cmp f.n ff.n2
+cmp x509-f.n x509-ff.n2

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

-cmp f.n ff.n3
+cmp x509-f.n x509-ff.n3

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

-cmp f.p ff.p1
+cmp x509-f.p x509-ff.p1

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

-cmp f.p ff.p2
+cmp x509-f.p x509-ff.p2

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

-cmp f.p ff.p3
+cmp x509-f.p x509-ff.p3

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

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

 exit 0
 exit 0