RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 15-Aug-2009 00:24:18 Branch: HEAD Handle: 2009081422241701 Modified files: rpm/rpmio gengpg.sh librpmio.vers rpmbc.c rpmgc.c rpmnss.c rpmpgp.c rpmpgp.h rpmssl.c tkey.c Log: ecdsa: stub in OpenPGP packet parsing for ECDSA pubkeys/signatures. Summary: Revision Changes Path 2.3 +40 -1 rpm/rpmio/gengpg.sh 2.135 +1 -0 rpm/rpmio/librpmio.vers 2.17 +4 -0 rpm/rpmio/rpmbc.c 2.18 +4 -0 rpm/rpmio/rpmgc.c 1.26 +4 -0 rpm/rpmio/rpmnss.c 2.107 +70 -0 rpm/rpmio/rpmpgp.c 2.86 +5 -1 rpm/rpmio/rpmpgp.h 2.23 +4 -0 rpm/rpmio/rpmssl.c 2.27 +29 -0 rpm/rpmio/tkey.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmio/gengpg.sh ============================================================================ $ cvs diff -u -r2.2 -r2.3 gengpg.sh --- rpm/rpmio/gengpg.sh 12 Dec 2007 16:18:00 -0000 2.2 +++ rpm/rpmio/gengpg.sh 14 Aug 2009 22:24:17 -0000 2.3 @@ -22,7 +22,7 @@ %commit GO_SYSIN_DD -str="abc" +str="Signed\n" echo "static const char * str = \"$str\";" echo "static const char * DSApub =" @@ -41,5 +41,44 @@ echo -n "$str" | $gpg -sab -u RSApub | sed -e'1,3d; $d' | sed -e's/^/"/; s/$/\\n"/; $d' echo ";" +echo "static const char * ECDSAsig =" +cat << GO_SYSIN_DD | sed -e'1,3d; $d' | sed -e's/^/"/; s/$/\\n"/; $d' +-----BEGIN PGP SIGNATURE----- +Version: PGP SDK 3.11.0 + +iQBXAwUBSMjHk4QJEy1tIUM0EwhkLQEAw+SAPNMClecbCzvb8Rpx6fov5eJ3ShVs +gAtyf/w/IiwBAJNz/QD/qtHN13o1rlrJKlCXrbnfEsVl5gkMIULH+eEU +=uWBi +-----END PGP SIGNATURE----- +GO_SYSIN_DD +echo ";" + +echo "static const char * ECDSApub =" +cat << GO_SYSIN_DD | sed -e'1,3d; $d' | sed -e's/^/"/; s/$/\\n"/; $d' +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: PGP SDK 3.11.0 + +mQBSBEjIvdoTCCqGSM49AwEHAgMEilTubmrCj7X11p6CxMO+Ifg34Bzp8UZdHh5V +40oEoS7qcjFQ0e3gjWB9DfSkiTKLaOwhDBttR+Hw8TG/v4YtubQiRUNDIFAtMjU2 +IDxlY2MtcC0yNTZAYnJhaW5odWIuY29tPokArAQQEwIAVAUCSMi92gUJCWYBgDAU +gAAAAAAgAAdwcmVmZXJyZWQtZW1haWwtZW5jb2RpbmdAcGdwLmNvbXBncG1pbWUD +CwkHAhkBBRsBAAAABR4BAAAAAxUICgAKCRAY1dFUqLaa54AuAQCgn5OR4KLbGzGS +4y223be1JC0KTK2GWCuJFIOE7g+llQEAgXbpaNqOcwyOV4PDdZq5Q0bP/QAIhkh8 +hSF5N742KlS5AFUESMi92xIIKoZIzj0DAQcBCAcCAwRcohj5GzIlKZaKZuPqmr9l +B4jGEMvzgCglI1syEkJitvoOrR7dpAx/n56WBcMez3GPApv4ikmSGI3qB7HoqOep +iQBqBBgTAgASBQJIyL3bBQkJZgGABRsMAAAAAAoJEBjV0VSotprnk6oBAOetPj4t +5swFTcqfMZ3R4vh1RQ9k+tzlC36u8asprtxaAQCPH8HR2z/tggdsZKpdCtZyv3zn +GRTDr8dsiFqbp9mlIbkAUgRIyL3cEwgqhkjOPQMBBwIDBLUeFv+pPbEPmHfhqywM +weyvlMpIv8q/bwOhoU4hiUs+RMbrUx4tpe73T5kFKCa+9lmeurujkjx+63qpPPd2 +ptyJAMoEGBMCAHIFAkjIvd0FCQlmAYAFGwIAAABfIAQZEwgABgUCSMi93AAKCRCE +CRMtbSFDNClhAQCxtGwZqqhYTw7GX1cEtxbYsWOD9ZkocZiU+x+ryCfqBgEA+WQN +Wfw5sfwG0GRScbPwFmkjlMnKwhuFK+g2V45+124ACgkQGNXRVKi2mufzNQEAuLNz +FeS/YwMWhTaedMduGYJG/sNxZhR+lVAgYNSy/FcA/RbDyY6W4C7geTB5iuTicfuK +cJmScU/alaH8fgp3uja1 +=FfP1 +-----END PGP PUBLIC KEY BLOCK----- +GO_SYSIN_DD +echo ";" + rm -rf $hdir @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/librpmio.vers ============================================================================ $ cvs diff -u -r2.134 -r2.135 librpmio.vers --- rpm/rpmio/librpmio.vers 17 Jul 2009 03:09:24 -0000 2.134 +++ rpm/rpmio/librpmio.vers 14 Aug 2009 22:24:17 -0000 2.135 @@ -439,6 +439,7 @@ rpmmgNew; rpmmgFile; rpmmgBuffer; + _rpmnss_init; rpmnssImplVecs; _rpmperl_debug; rpmperlNew; @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmbc.c ============================================================================ $ cvs diff -u -r2.16 -r2.17 rpmbc.c --- rpm/rpmio/rpmbc.c 2 Mar 2009 00:45:55 -0000 2.16 +++ rpm/rpmio/rpmbc.c 14 Aug 2009 22:24:18 -0000 2.17 @@ -228,6 +228,10 @@ switch (itemno) { default: assert(0); + case 50: /* ECDSA r */ + case 51: /* ECDSA s */ + case 60: /* ECDSA curve OID */ + case 61: /* ECDSA Q */ break; case 10: /* RSA m**d */ (void) mpnsethex(&bc->c, pgpMpiHex(p)); @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmgc.c ============================================================================ $ cvs diff -u -r2.17 -r2.18 rpmgc.c --- rpm/rpmio/rpmgc.c 2 Mar 2009 00:45:55 -0000 2.17 +++ rpm/rpmio/rpmgc.c 14 Aug 2009 22:24:18 -0000 2.18 @@ -271,6 +271,10 @@ switch (itemno) { default: assert(0); + case 50: /* ECDSA r */ + case 51: /* ECDSA s */ + case 60: /* ECDSA curve OID */ + case 61: /* ECDSA Q */ break; case 10: /* RSA m**d */ mpiname ="RSA m**d"; mpip = &gc->c; @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmnss.c ============================================================================ $ cvs diff -u -r1.25 -r1.26 rpmnss.c --- rpm/rpmio/rpmnss.c 2 Mar 2009 00:45:55 -0000 1.25 +++ rpm/rpmio/rpmnss.c 14 Aug 2009 22:24:18 -0000 1.26 @@ -269,6 +269,10 @@ switch (itemno) { default: assert(0); + case 50: /* ECDSA r */ + case 51: /* ECDSA s */ + case 60: /* ECDSA curve OID */ + case 61: /* ECDSA Q */ break; case 10: /* RSA m**d */ nss->rsasig = rpmnssMpiCopy(NULL, nss->rsasig, p); @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmpgp.c ============================================================================ $ cvs diff -u -r2.106 -r2.107 rpmpgp.c --- rpm/rpmio/rpmpgp.c 3 Jul 2009 18:16:12 -0000 2.106 +++ rpm/rpmio/rpmpgp.c 14 Aug 2009 22:24:18 -0000 2.107 @@ -93,6 +93,7 @@ { PGPPUBKEYALGO_ECDSA, "ECDSA" }, { PGPPUBKEYALGO_ELGAMAL, "Elgamal" }, { PGPPUBKEYALGO_DH, "Diffie-Hellman (X9.42)" }, + { PGPPUBKEYALGO_ECDH, "ECDH" }, { -1, "Unknown public key algorithm" }, }; @@ -108,6 +109,9 @@ { PGPSYMKEYALGO_AES_192, "AES(192-bit key)" }, { PGPSYMKEYALGO_AES_256, "AES(256-bit key)" }, { PGPSYMKEYALGO_TWOFISH, "TWOFISH(256-bit key)" }, + { PGPSYMKEYALGO_CAMELLIA_128, "CAMELLIA(128-bit key)" }, + { PGPSYMKEYALGO_CAMELLIA_192, "CAMELLIA(192-bit key)" }, + { PGPSYMKEYALGO_CAMELLIA_256, "CAMELLIA(256-bit key)" }, { PGPSYMKEYALGO_NOENCRYPT, "no encryption" }, { -1, "Unknown symmetric key algorithm" }, }; @@ -389,6 +393,13 @@ " s =", NULL, }; + +/*...@observer@*/ /*...@unchecked@*/ +static const char * pgpSigECDSA[] = { + " r =", + " s =", + NULL, +}; /*...@=varuse =readonlytrans =nullassign @*/ static int pgpPrtSigParams(const pgpPkt pp, pgpPubkeyAlgo pubkey_algo, @@ -438,6 +449,26 @@ if (xx) return xx; } pgpPrtStr("", pgpSigDSA[i]); + } else if (pubkey_algo == PGPPUBKEYALGO_ECDSA) { + if (i >= 2) break; + if (_dig && + (sigtype == PGPSIGTYPE_BINARY || sigtype == PGPSIGTYPE_TEXT)) + { + xx = 0; + switch (i) { + case 0: /* r */ + xx = pgpImplMpiItem(pgpSigECDSA[i], _dig, 50+i, p, pend); + /*...@switchbreak@*/ break; + case 1: /* s */ + xx = pgpImplMpiItem(pgpSigECDSA[i], _dig, 50+i, p, pend); + /*...@switchbreak@*/ break; + default: + xx = 1; + /*...@switchbreak@*/ break; + } + if (xx) return xx; + } + pgpPrtStr("", pgpSigECDSA[i]); } else { if (_pgp_print) fprintf(stderr, "%7d", i); @@ -595,6 +626,20 @@ #endif /*...@observer@*/ /*...@unchecked@*/ +static const char * pgpPublicECDSA[] = { + " Q =", + NULL, +}; + +#ifdef NOTYET +/*...@observer@*/ /*...@unchecked@*/ +static const char * pgpSecretECDSA[] = { + " d =", + NULL, +}; +#endif + +/*...@observer@*/ /*...@unchecked@*/ static const char * pgpPublicELGAMAL[] = { " p =", " g =", @@ -655,6 +700,24 @@ } } pgpPrtStr("", pgpPublicDSA[i]); + } else if (pubkey_algo == PGPPUBKEYALGO_ECDSA) { + if (i >= 1) break; + if (_dig) { + switch (i) { + case 0: /* curve & Q */ + (void) pgpImplMpiItem(pgpPublicECDSA[i], _dig, 60, p+1, p+1+p[0]); + (void) pgpImplMpiItem(pgpPublicECDSA[i], _dig, 61, p+1+p[0], NULL); + /*...@switchbreak@*/ break; + default: + /*...@switchbreak@*/ break; + } + } + if (i == 0) { + pgpPrtHex(" Curve = [ OID]:", p+1, p[0]); + p += 1 + p[0]; + pgpPrtNL(); + } + pgpPrtStr("", pgpPublicECDSA[i]); } else if (pubkey_algo == PGPPUBKEYALGO_ELGAMAL_ENCRYPT) { if (i >= 3) break; pgpPrtStr("", pgpPublicELGAMAL[i]); @@ -721,6 +784,9 @@ } else if (pubkey_algo == PGPPUBKEYALGO_DSA) { if (pgpSecretDSA[i] == NULL) break; pgpPrtStr("", pgpSecretDSA[i]); + } else if (pubkey_algo == PGPPUBKEYALGO_ECDSA) { + if (pgpSecretECDSA[i] == NULL) break; + pgpPrtStr("", pgpSecretECDSA[i]); } else if (pubkey_algo == PGPPUBKEYALGO_ELGAMAL_ENCRYPT) { if (pgpSecretELGAMAL[i] == NULL) break; pgpPrtStr("", pgpSecretELGAMAL[i]); @@ -920,6 +986,10 @@ for (i = 0; i < 4; i++) se += pgpMpiLen(se); /*...@innerbreak@*/ break; + case PGPPUBKEYALGO_ECDSA: + for (i = 0; i < 4; i++) + se += pgpMpiLen(se); + /*...@innerbreak@*/ break; } { DIGEST_CTX ctx = rpmDigestInit(PGPHASHALGO_SHA1, RPMDIGEST_NONE); (void) rpmDigestUpdate(ctx, pkt, (se-pkt)); @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmpgp.h ============================================================================ $ cvs diff -u -r2.85 -r2.86 rpmpgp.h --- rpm/rpmio/rpmpgp.h 3 Jul 2009 18:16:12 -0000 2.85 +++ rpm/rpmio/rpmpgp.h 14 Aug 2009 22:24:18 -0000 2.86 @@ -248,7 +248,8 @@ PGPPUBKEYALGO_EC = 18, /*!< Elliptic Curve */ PGPPUBKEYALGO_ECDSA = 19, /*!< ECDSA */ PGPPUBKEYALGO_ELGAMAL = 20, /*!< Elgamal */ - PGPPUBKEYALGO_DH = 21 /*!< Diffie-Hellman (X9.42) */ + PGPPUBKEYALGO_DH = 21, /*!< Diffie-Hellman (X9.42) */ + PGPPUBKEYALGO_ECDH = 22 /*!< ECC Diffie-Hellman */ } pgpPubkeyAlgo; /*...@=typeuse@*/ @@ -295,6 +296,9 @@ PGPSYMKEYALGO_AES_192 = 8, /*!< AES(192-bit key) */ PGPSYMKEYALGO_AES_256 = 9, /*!< AES(256-bit key) */ PGPSYMKEYALGO_TWOFISH = 10, /*!< TWOFISH(256-bit key) */ + PGPSYMKEYALGO_CAMELLIA_128 = 11, /*!< CAMELLIA(128-bit key) */ + PGPSYMKEYALGO_CAMELLIA_192 = 12, /*!< CAMELLIA(192-bit key) */ + PGPSYMKEYALGO_CAMELLIA_256 = 13, /*!< CAMELLIA(256-bit key) */ PGPSYMKEYALGO_NOENCRYPT = 110 /*!< no encryption */ } pgpSymkeyAlgo; /*...@=typeuse@*/ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmssl.c ============================================================================ $ cvs diff -u -r2.22 -r2.23 rpmssl.c --- rpm/rpmio/rpmssl.c 2 Mar 2009 00:45:55 -0000 2.22 +++ rpm/rpmio/rpmssl.c 14 Aug 2009 22:24:18 -0000 2.23 @@ -267,6 +267,10 @@ switch (itemno) { default: assert(0); + case 50: /* ECDSA r */ + case 51: /* ECDSA s */ + case 60: /* ECDSA curve OID */ + case 61: /* ECDSA Q */ break; case 10: /* RSA m**d */ ssl->c = BN_bin2bn(p+2, nb, ssl->c); @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/tkey.c ============================================================================ $ cvs diff -u -r2.26 -r2.27 tkey.c --- rpm/rpmio/tkey.c 12 Dec 2007 19:24:13 -0000 2.26 +++ rpm/rpmio/tkey.c 14 Aug 2009 22:24:18 -0000 2.27 @@ -166,6 +166,35 @@ dig = pgpDigFree(dig); + pgpImplVecs = &rpmsslImplVecs; + + dig = pgpDigNew(0); +_pgp_debug = 1; +_pgp_print = 1; + +fprintf(stderr, "=============================== ECDSA Public Key\n"); + if ((rc = doit(ECDSApub, dig, printing)) != 0) + fprintf(stderr, "==> FAILED: rc %d\n", rc); + +fprintf(stderr, "=============================== ECDSA Signature of \"%s\"\n", str); + if ((rc = doit(ECDSAsig, dig, printing)) != 0) + fprintf(stderr, "==> FAILED: rc %d\n", rc); + + { DIGEST_CTX ctx = rpmDigestInit(PGPHASHALGO_SHA256, RPMDIGEST_NONE); + pgpDigParams dsig = pgpGetSignature(dig); + + rpmDigestUpdate(ctx, str, strlen(str)); + rpmDigestUpdate(ctx, dsig->hash, dsig->hashlen); + + (void) pgpImplSetECDSA(ctx, dig, dsig); + } + + rc = pgpImplVerifyECDSA(dig); + +fprintf(stderr, "=============================== ECDSA verify: rc %d\n", rc); + + dig = pgpDigFree(dig); + if (pgpImplVecs == &rpmnssImplVecs) NSS_Shutdown(); @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
