diff options
Diffstat (limited to '')
| -rw-r--r-- | checks/Makefile.am | 2 | ||||
| -rwxr-xr-x | checks/checkit | 15 | ||||
| -rw-r--r-- | checks/gnupg.asc | 12 | ||||
| -rw-r--r-- | checks/pubring.g10 | bin | 2813 -> 0 bytes | |||
| -rw-r--r-- | checks/secring.g10 | bin | 2210 -> 0 bytes |
5 files changed, 21 insertions, 8 deletions
diff --git a/checks/Makefile.am b/checks/Makefile.am index 4bf639739..2d999a502 100644 --- a/checks/Makefile.am +++ b/checks/Makefile.am @@ -2,7 +2,7 @@ TESTS = checkit -TEST_FILES = pubring.asc secring.asc plain-1 plain-2 plain-3o.asc \ +TEST_FILES = pubring.asc secring.asc gnupg.asc plain-1 plain-2 plain-3o.asc \ plain-1.asc plain-2.asc plain-3.asc EXTRA_DIST = $(TESTS) $(TEST_FILES) diff --git a/checks/checkit b/checks/checkit index 787da1153..7da825afe 100755 --- a/checks/checkit +++ b/checks/checkit @@ -44,15 +44,15 @@ cleanup () { run_g10 () { - if ! eval ../g10/g10 --homedir . $* ; then - echo "(../g10/g10 --homedir . $*) failed" >&2 + if ! eval ../g10/gpg --homedir . $* ; then + echo "(../g10/gpg --homedir . $*) failed" >&2 exit 1 fi } run_g10maint () { - if ! eval ../g10/g10maint --homedir . $* ; then - echo "(../g10/g10maint --homedir . $*) failed" >&2 + if ! eval ../g10/gpgm --homedir . $* ; then + echo "(../g10/gpgm --homedir . $*) failed" >&2 exit 1 fi } @@ -85,8 +85,9 @@ EOF 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 pubring.gpg pubring.asc +run_g10maint --yes --dearmor -o secring.gpg secring.asc +run_g10maint --yes --dearmor -o gnupg.sig gnupg.asc run_g10maint --yes --dearmor -o plain-3 plain-3o.asc plain_files="$plain_files plain-3" # make sure all files are created @@ -94,7 +95,7 @@ echo "$usrpass1" | run_g10 --no-operation info Checking decryption for i in $plain_files ; do -run_g10 --passphrase-fd 0 -o y --yes $i.asc + echo "$usrpass1" | run_g10 --passphrase-fd 0 -o y --yes $i.asc cmp $i y || error "$i: mismatch" done diff --git a/checks/gnupg.asc b/checks/gnupg.asc new file mode 100644 index 000000000..54f9824d6 --- /dev/null +++ b/checks/gnupg.asc @@ -0,0 +1,12 @@ +-----BEGIN PGP ARMORED FILE----- +Version: GNUPG v0.2.7b (Linux) +Comment: This is an alpha version! +Comment: Use "g10maint --dearmor" for unpacking + +0CEjY3JlYXRlZCBieSBHTlVQRyB2MC4yLjdiIChMaW51eCmQDQMAAxDlaCrLPviEowGI1wMFADTy +2TnlaCrLPviEoxADgEwC/jmq4S8mH3ulVqOyszVXwLaOGwtNdQMc+q5yOTiGTme6tLrYshsXDrG0 +qEeLEny8gqPpuUSH0Qht5V45sD8EfYBqptoxYiwpHlQcghrEUqGgo+QgXffPcrlbGINs576mugMA +mj/y4wOgoeJmc8WWNEnx+LehCZE1OaLpV5IWHigefsVLLv7jcQ2j80yxdCllqzvQTPQN+tlVoGei +yoC4BF2wzoG8sWJ0B9xFkQ/WV0jh1vpWiSfnZU1yhVkRNMk7SodM +=Ehf8 +-----END PGP ARMORED FILE----- diff --git a/checks/pubring.g10 b/checks/pubring.g10 Binary files differdeleted file mode 100644 index 17fbe0507..000000000 --- a/checks/pubring.g10 +++ /dev/null diff --git a/checks/secring.g10 b/checks/secring.g10 Binary files differdeleted file mode 100644 index 8f1223615..000000000 --- a/checks/secring.g10 +++ /dev/null |