new files

checks/checkit

@@ -10,7 +10,7 @@ usrname1="one"
 usrpass1="def"
 usrname2="two"
 usrpass2="abc"
-plain_files="plain-1 plain-2 plain-3"
+plain_files="plain-1 plain-2"
 data_files=""
 exp_files=""
 
@@ -50,6 +50,13 @@ run_g10 () {
     fi
 }
 
+run_g10maint () {
+    if ! eval ../g10/g10maint --homedir . $* ; then
+	echo "(../g10/g10maint --homedir . $*) failed" >&2
+	exit 1
+    fi
+}
+
 #--------------------------------
 #-------- main program ----------
 #--------------------------------
@@ -60,7 +67,7 @@ trap cleanup SIGHUP SIGINT SIGQUIT
 
 
 # some checks
-for i in $plain_files; do
+for i in $plain_files plain-3o.asc ; do
     [ -f $i ] || fatal "$i: missing"
 done
 for i in $exp_files; do
@@ -77,6 +84,13 @@ EOF
 # print the G10 version
 run_g10 --version
 
+info Unpacking some material
+run_g10maint --yes --dearmor -o pubring.g10 pubring.asc
+run_g10maint --yes --dearmor -o secring.g10 secring.asc
+run_g10maint --yes --dearmor -o plain-3 plain-3o.asc
+plain_files="$plain_files plain-3"
+
+
 
 info Checking decryption
 for i in $plain_files ; do
@@ -124,7 +138,7 @@ done
 info Checking armored encryption
 for i in $plain_files $data_files ; do
     run_g10 -ea -o x --yes -r "$usrname2" $i
-    run_g10 -o y --yes x
+    echo "$usrpass2" | run_g10 -o y --yes x
     cmp $i y || error "$i: mismatch"
 done
 

checks/distfiles

@@ -1,7 +1,10 @@
 checkit
+pubring.asc
+secring.asc
 plain-1
 plain-2
-plain-3
+plain-3o.asc
 plain-1.asc
 plain-2.asc
 plain-3.asc
+

checks/plain-3

@@ -1 +0,0 @@
-Dies ist eine einfache Zeile ohne LF am Ende.

checks/plain-3o.asc

@@ -0,0 +1,10 @@
+Stored by G10, because diff/patch have problems with
+files not having a trailing LF - and this one has none.
+
+-----BEGIN PGP ARMORED FILE-----
+Version: G10 v0.2.6a (Linux)
+Comment: This is an alpha version!
+
+RGllcyBpc3QgZWluZSBlaW5mYWNoZSBaZWlsZSBvaG5lIExGIGFtIEVuZGUu
+=ZQ6m
+-----END PGP ARMORED FILE-----

checks/pubring.asc

@@ -0,0 +1,60 @@
+This is a test public keyring simply stored by G10 so that
+it is easier to make diff files.
+
+
+-----BEGIN PGP ARMORED FILE-----
+Version: G10 v0.2.6a (Linux)
+Comment: This is an alpha version!
+
+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
+jz83sfwIwn1g8v2gPC3WKbDr+0k=
+=OloO
+-----END PGP ARMORED FILE-----

checks/secring.asc

@@ -0,0 +1,47 @@
+This is a test secret keyring simply stored by G10 so that
+it is easier to make diff files.
+
+-----BEGIN PGP ARMORED FILE-----
+Version: G10 v0.2.6a (Linux)
+Comment: This is an alpha version!
+
+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9MjE
+-----END PGP ARMORED FILE-----