RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 19-Feb-2015 23:04:44
Branch: rpm-5_4 Handle: 2015021922044400
Modified files: (Branch: rpm-5_4)
rpm/tests Makefile.am genpgp.sh
Log:
- gnupg: add external ECSDA signing support.
Summary:
Revision Changes Path
1.95.2.72 +11 -2 rpm/tests/Makefile.am
1.3.4.2 +77 -51 rpm/tests/genpgp.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
============================================================================
$ cvs diff -u -r1.95.2.71 -r1.95.2.72 Makefile.am
--- rpm/tests/Makefile.am 9 Oct 2014 02:57:41 -0000 1.95.2.71
+++ rpm/tests/Makefile.am 19 Feb 2015 22:04:44 -0000 1.95.2.72
@@ -223,7 +223,7 @@
@-diff -u tmp/querytags ref/querytags || cp tmp/querytags ref/querytags
@${rpm} -v --showrc | ${sed} -e "s,$(abs_top_builddir),..,g" >
tmp/showrc
@-diff -u tmp/showrc ref/showrc || cp tmp/showrc ref/showrc
- @${rpmdigest} --alldigests ref/[^C]* > tmp/.alldigests
+# @${rpmdigest} --alldigests ref/[^C]* > tmp/.alldigests
# @-diff -u tmp/.alldigests ref/.alldigests || cp tmp/.alldigests
ref/.alldigests
@-${mtree} -c -p ref | ${mtree} -p ref # XXX mtime usecs need fixing
@@ -244,6 +244,7 @@
@${cp} ref/DB_CONFIG tmp/rpmdb
@${rpm} --import tmp/DSA.pubpem
@${rpm} --import tmp/RSA.pubpem
+ @[ -f tmp/ECDSA.pubpem ] && ${rpm} --import tmp/ECDSA.pubpem
@${echo} -n "--> default: HKP"
@${thkp} > tmp/hkp || :
@diff -u tmp/hkp ref/hkp || cp tmp/hkp ref/hkp
@@ -290,6 +291,11 @@
@${rpm} -D'_gpg_name Ronald' --addsign --nopassword edos-test/*.rpm >
/dev/null
@${rpm} -qp edos-test/*.rpm > /dev/null
@${rpm} -Kv edos-test/*.rpm > /dev/null
+ @echo "--> ECDSA:"
+ @${rpm} --delsign cudf-test/*.rpm > /dev/null
+ @${rpm} -D'_gpg_name Eric' --addsign --nopassword cudf-test/*.rpm >
/dev/null
+ @${rpm} -qp cudf-test/*.rpm > /dev/null
+ @${rpm} -Kv cudf-test/*.rpm > /dev/null
.PHONY: check-ssl
check-ssl: tssl
@@ -378,6 +384,7 @@
@${cp} ref/DB_CONFIG tmp/cachedb
@${rpmsolver} --import tmp/DSA.pubpem
@${rpmsolver} --import tmp/RSA.pubpem
+ @[ -f tmp/ECDSA.pubpem ] && ${rpmsolver} --import tmp/ECDSA.pubpem
@${rpmsolver} -i --justdb --nodeps edos-test/*.rpm
@rm -rf tmp/hrmib tmp/repackage
@mkdir -p tmp/hrmib/ tmp/repackage/
@@ -400,12 +407,14 @@
@${cp} ref/DB_CONFIG tmp/solveA
@${rpmsolverA} --import tmp/DSA.pubpem
@${rpmsolverA} --import tmp/RSA.pubpem
+ @[ -f tmp/ECDSA.pubpem ] && ${rpmsolverA} --import tmp/ECDSA.pubpem
@${rpmsolverA} -i --justdb --nodeps edos-test/turbo-1*
edos-test/wheel-2* edos-test/door-1*
@rm -rf tmp/solveB
@${mkdir} -p tmp/solveB/log tmp/solveB/tmp
@${cp} ref/DB_CONFIG tmp/solveB
@${rpmsolverB} --import tmp/DSA.pubpem
@${rpmsolverB} --import tmp/RSA.pubpem
+ @[ -f tmp/ECDSA.pubpem ] && ${rpmsolverB} --import tmp/ECDSA.pubpem
@${rpmsolverB} -i --justdb --nodeps edos-test/engine-2*
@rm -rf tmp/hrmib tmp/repackage
@mkdir -p tmp/hrmib/ tmp/repackage/
@@ -1113,7 +1122,7 @@
@echo "FOO" > ${gfsfn}
@cat ${gfsfn} >> tmp/gfs.out 2>&1
@echo "--> put ${gfsfn} <= ${gfsfn}"
- @-${tgfs} put ${gfsfn} ${gfsfn} >> tmp/gfs.out 2>&1
+ @${tgfs} put ${gfsfn} ${gfsfn} >> tmp/gfs.out 2>&1
@echo "--> list"
@${tgfs} list >> tmp/gfs.out 2>&1
@echo "--> get ${gfsfn}"
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/genpgp.sh
============================================================================
$ cvs diff -u -r1.3.4.1 -r1.3.4.2 genpgp.sh
--- rpm/tests/genpgp.sh 13 Aug 2014 17:52:55 -0000 1.3.4.1
+++ rpm/tests/genpgp.sh 19 Feb 2015 22:04:44 -0000 1.3.4.2
@@ -5,13 +5,17 @@
plaintext="$top/plaintext"
DSA="$top/DSA"
RSA="$top/RSA"
-#ECDSA="$top/ECDSA"
-#EDDSA="$top/EDDSA"
+ECDSA="$top/ECDSA"
+#EdDSA="$top/EdDSA"
passphrase="123456"
setpass="/usr/libexec/gpg-preset-passphrase --preset --passphrase
$passphrase"
-gpg="gpg2 --batch --homedir $hdir"
+gpg="gpg2 --homedir $hdir --batch"
+gpg_agent="gpg-agent --homedir $hdir"
+gpg_connect_agent="gpg-connect-agent --homedir $hdir"
+
+$gpg_agent -q && $gpg_connect_agent -q killagent /bye > /dev/null
rm -rf $hdir
mkdir -p $hdir
@@ -33,24 +37,39 @@
#allow-preset-passphrase
GO_SYSIN_DD
-eval $(gpg-agent --batch --homedir $hdir --daemon)
+#eval $($gpg_agent --batch --daemon)
+$gpg_connect_agent -q /bye > /dev/null
$gpg --debug-quick-random --gen-key << GO_SYSIN_DD
Key-Type: DSA
Key-Length: 1024
Key-Usage: sign
Name-Real: Donald
-Name-Comment: 1024
+Name-Comment: DSA/1024
Name-Email: rpm-de...@rpm5.org
Expire-Date: 1d
+%no-protection
+%transient-key
%commit
Key-Type: RSA
Key-Length: 1024
Key-Usage: sign,encrypt
Name-Real: Ronald
-Name-Comment: 1024
+Name-Comment: RSA/1024
Name-Email: rpm-de...@rpm5.org
Expire-Date: 1d
+%no-protection
+%transient-key
+%commit
+Key-Type: ECDSA
+Key-Length: 256
+Key-Curve: NIST P-256
+Name-Real: Eric
+Name-Comment: ECDSA/256 NIST P-256
+Name-Email: rpm-de...@rpm5.org
+Expire-Date: 1d
+%no-protection
+%transient-key
%commit
GO_SYSIN_DD
@@ -61,14 +80,13 @@
#%no-protection
#%transient-key
-#Key-Type: ECDSA
-#Key-Length: 256
-#Key-Curve: NIST P-256
-#Name-Real: Eric
-#Name-Comment: 256 NIST P-256
+#Key-Type: EdDSA
+#Key-Length: 255
+#Key-Curve: Curve 25519
+#Name-Real: Daniel
+#Name-Comment: EdDSA/256 Curve 25519
#Name-Email: rpm-de...@rpm5.org
-#Expire-Date: 1
-#Keyserver: hkp://keys.rpm5.org
+#Expire-Date: 1d
#%no-protection
#%transient-key
#%commit
@@ -97,12 +115,12 @@
$gpg --export Donald > ${DSA}.pub
$gpg --export -a Donald > ${DSA}.pubpem
-echo "static const char * DSAsig = \"${DSA}.sig\";"
-echo "static const char * DSAsigpem = \"${DSA}.sigpem\";"
-echo "static const char * DSApem = \"${DSA}.pem\";"
-echo "static const char * DSApub = \"${DSA}.pub\";"
-echo "static const char * DSApubpem = \"${DSA}.pubpem\";"
-echo "static const char * DSApubid = \"`cat ${DSA}.grip`\";"
+echo "static const char * DSAsig = \"${DSA}.sig\";"
+echo "static const char * DSAsigpem = \"${DSA}.sigpem\";"
+echo "static const char * DSApem = \"${DSA}.pem\";"
+echo "static const char * DSApub = \"${DSA}.pub\";"
+echo "static const char * DSApubpem = \"${DSA}.pubpem\";"
+echo "static const char * DSApubid = \"`cat ${DSA}.grip`\";"
rsa="$gpg -u Ronald"
$gpg --fingerprint Ronald | grep 'finger' | sed -e 's/.*print = //' -e 's/
//g' > ${RSA}.grip
@@ -114,35 +132,43 @@
$gpg --export Ronald > ${RSA}.pub
$gpg --export -a Ronald > ${RSA}.pubpem
-echo "static const char * RSAsig = \"${RSA}.sig\";"
-echo "static const char * RSAsigpem = \"${RSA}.sigpem\";"
-echo "static const char * RSApem = \"${RSA}.pem\";"
-echo "static const char * RSApub = \"${RSA}.pub\";"
-echo "static const char * RSApubpem = \"${RSA}.pubpem\";"
-echo "static const char * RSApubid = \"`cat ${RSA}.grip`\";"
-
-#$gpg --detach-sign -u Daniel --output - $plaintext > ${EDDSA}.sig
-#$gpg --detach-sign -a -u Daniel --output - $plaintext > ${EDDSA}.sigpem
-#$gpg --clearsign -u Daniel --output - $plaintext > ${EDDSA}.pem
-#$gpg --export Daniel > ${EDDSA}.pub
-#$gpg --export -a Daniel > ${EDDSA}.pubpem
-
-#echo "static const char * EDDSAsig = \"${EDDSA}.sig\";"
-#echo "static const char * EDDSAsigpem = \"${EDDSA}.sigpem\";"
-#echo "static const char * EDDSApem = \"${EDDSA}.pem\";"
-#echo "static const char * EDDSApub = \"${EDDSA}.pub\";"
-#echo "static const char * EDDSApubpem = \"${EDDSA}.pubpem\";"
-#echo "static const char * EDDSApubid = \"`$gpg --fingerprint Daniel | grep
'finger' | sed -e 's/.*print = //' -e 's/ //g'`\";"
-
-#$gpg --detach-sign -u Eric --output - $plaintext > ${ECDSA}.sig
-#$gpg --detach-sign -a -u Eric --output - $plaintext > ${ECDSA}.sigpem
-#$gpg --clearsign -u Eric --output - $plaintext > ${ECDSA}.pem
-#$gpg --export Eric > ${ECDSA}.pub
-#$gpg --export -a Eric > ${ECDSA}.pubpem
-
-#echo "static const char * ECDSAsig = \"${ECDSA}.sig\";"
-#echo "static const char * ECDSAsigpem = \"${ECDSA}.sigpem\";"
-#echo "static const char * ECDSApem = \"${ECDSA}.pem\";"
-#echo "static const char * ECDSApub = \"${ECDSA}.pub\";"
-#echo "static const char * ECDSApubpem = \"${ECDSA}.pubpem\";"
-#echo "static const char * ECDSApubid = \"`$gpg --fingerprint Eric | grep
'finger' | sed -e 's/.*print = //' -e 's/ //g'`\";"
+echo "static const char * RSAsig = \"${RSA}.sig\";"
+echo "static const char * RSAsigpem = \"${RSA}.sigpem\";"
+echo "static const char * RSApem = \"${RSA}.pem\";"
+echo "static const char * RSApub = \"${RSA}.pub\";"
+echo "static const char * RSApubpem = \"${RSA}.pubpem\";"
+echo "static const char * RSApubid = \"`cat ${RSA}.grip`\";"
+
+ecdsa="$gpg -u Eric"
+$gpg --fingerprint Eric | grep 'finger' | sed -e 's/.*print = //' -e 's/
//g' > ${ECDSA}.grip
+#$setpass `cat ${ECDSA}.grip`
+
+$ecdsa --detach-sign --output - $plaintext > ${ECDSA}.sig
+$ecdsa --detach-sign -a --output - $plaintext > ${ECDSA}.sigpem
+$ecdsa --clearsign --output - $plaintext > ${ECDSA}.pem
+$gpg --export Eric > ${ECDSA}.pub
+$gpg --export -a Eric > ${ECDSA}.pubpem
+
+echo "static const char * ECDSAsig = \"${ECDSA}.sig\";"
+echo "static const char * ECDSAsigpem = \"${ECDSA}.sigpem\";"
+echo "static const char * ECDSApem = \"${ECDSA}.pem\";"
+echo "static const char * ECDSApub = \"${ECDSA}.pub\";"
+echo "static const char * ECDSApubpem = \"${ECDSA}.pubpem\";"
+echo "static const char * ECDSApubid = \"`cat ${ECDSA}.grip`\";"
+
+#eddsa="$gpg -u Daniel"
+#$gpg --fingerprint Daniel | grep 'finger' | sed -e 's/.*print = //' -e 's/
//g' > ${EdDSA}.grip
+#$setpass `cat ${EdDSA}.grip`
+
+#$eddsa --detach-sign --output - $plaintext > ${EdDSA}.sig
+#$eddsa --detach-sign -a --output - $plaintext > ${EdDSA}.sigpem
+#$eddsa --clearsign --output - $plaintext > ${EdDSA}.pem
+#$gpg --export Daniel > ${EdDSA}.pub
+#$gpg --export -a Daniel > ${EdDSA}.pubpem
+
+#echo "static const char * EdDSAsig = \"${EdDSA}.sig\";"
+#echo "static const char * EdDSAsigpem = \"${EdDSA}.sigpem\";"
+#echo "static const char * EdDSApem = \"${EdDSA}.pem\";"
+#echo "static const char * EdDSApub = \"${EdDSA}.pub\";"
+#echo "static const char * EdDSApubpem = \"${EdDSA}.pubpem\";"
+#echo "static const char * EdDSApubid = \"`cat ${EdDSA}.grip`\";"
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
