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: 29-May-2010 22:40:41 Branch: HEAD Handle: 2010052920404000 Modified files: rpm/tests trsa.c Log: - rsa: WIP. Summary: Revision Changes Path 1.5 +167 -220 rpm/tests/trsa.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/tests/trsa.c ============================================================================ $ cvs diff -u -r1.4 -r1.5 trsa.c --- rpm/tests/trsa.c 29 May 2010 19:22:18 -0000 1.4 +++ rpm/tests/trsa.c 29 May 2010 20:40:40 -0000 1.5 @@ -112,8 +112,6 @@ extern int _pgp_print; /*...@=redecl@*/ -static int debug; -static int verbose; static int use_fips; static int in_fips_mode; static int selftest_only; @@ -198,7 +196,6 @@ #define FLAG_SIGN (1 << 1) #define FLAG_GRIP (1 << 2) -static int verbose; static int error_count; static void fail(const char *format, ...) @@ -248,11 +245,11 @@ size_t plaintextlen; char mac[MAX_DATA_LEN]; } tv[] = { - { GCRY_CIPHER_AES, + { PGPSYMKEYALGO_AES_128, "chicken teriyaki", "This is a sample plaintext for CBC MAC of sixtyfour bytes.......", 0, "\x23\x8f\x6d\xc7\x53\x6a\x62\x97\x11\xc4\xa5\x16\x43\xea\xb0\xb6" }, - { GCRY_CIPHER_3DES, + { PGPSYMKEYALGO_TRIPLE_DES, "abcdefghABCDEFGH01234567", "This is a sample plaintext for CBC MAC of sixtyfour bytes.......", 0, "\x5c\x11\xf0\x01\x47\xbd\x3d\x3a" }, @@ -268,14 +265,11 @@ int keylen; size_t i; - if (verbose) - fprintf(stderr, " Starting CBC MAC checks.\n"); + rpmlog(RPMLOG_INFO, " Starting CBC MAC checks.\n"); for (i = 0; i < sizeof(tv) / sizeof(tv[0]); i++) { if (gcry_cipher_test_algo(tv[i].algo) && in_fips_mode) { - if (verbose) - fprintf(stderr, - " algorithm %d not available in fips mode\n", + rpmlog(RPMLOG_INFO, " algorithm %d not available in fips mode\n", tv[i].algo); continue; } @@ -320,8 +314,7 @@ return; } - if (verbose) - fprintf(stderr, " checking CBC MAC for %s [%i]\n", + rpmlog(RPMLOG_INFO, " checking CBC MAC for %s [%i]\n", gcry_cipher_algo_name(tv[i].algo), tv[i].algo); err = gcry_cipher_encrypt(hd, out, blklen, @@ -350,8 +343,7 @@ gcry_cipher_close(hd); } - if (verbose) - fprintf(stderr, " Completed CBC MAC checks.\n"); + rpmlog(RPMLOG_INFO, " Completed CBC MAC checks.\n"); } static void check_aes128_cbc_cts_cipher(void) @@ -391,10 +383,9 @@ gcry_error_t err = 0; size_t i; - if (verbose) - fprintf(stderr, " Starting AES128 CBC CTS checks.\n"); + rpmlog(RPMLOG_INFO, " Starting AES128 CBC CTS checks.\n"); err = gcry_cipher_open(&hd, - GCRY_CIPHER_AES, + PGPSYMKEYALGO_AES_128, GCRY_CIPHER_MODE_CBC, GCRY_CIPHER_CBC_CTS); if (err) { fail("aes-cbc-cts, gcry_cipher_open failed: %s\n", @@ -419,8 +410,7 @@ return; } - if (verbose) - fprintf(stderr, " checking encryption for length %i\n", + rpmlog(RPMLOG_INFO, " checking encryption for length %i\n", tv[i].inlen); err = gcry_cipher_encrypt(hd, out, MAX_DATA_LEN, plaintext, tv[i].inlen); @@ -441,8 +431,7 @@ gcry_cipher_close(hd); return; } - if (verbose) - fprintf(stderr, " checking decryption for length %i\n", + rpmlog(RPMLOG_INFO, " checking decryption for length %i\n", tv[i].inlen); err = gcry_cipher_decrypt(hd, out, tv[i].inlen, NULL, 0); if (err) { @@ -457,8 +446,7 @@ } gcry_cipher_close(hd); - if (verbose) - fprintf(stderr, " Completed AES128 CBC CTS checks.\n"); + rpmlog(RPMLOG_INFO, " Completed AES128 CBC CTS checks.\n"); } static void check_ctr_cipher(void) @@ -476,7 +464,7 @@ } tv[] = { /* http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf */ - { GCRY_CIPHER_AES, + { PGPSYMKEYALGO_AES_128, "\x2b\x7e\x15\x16\x28\xae\xd2\xa6\xab\xf7\x15\x88\x09\xcf\x4f\x3c", "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff", { { "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96\xe9\x3d\x7e\x11\x73\x93\x17\x2a", @@ -493,7 +481,7 @@ "\x1e\x03\x1d\xda\x2f\xbe\x03\xd1\x79\x21\x70\xa0\xf3\x00\x9c\xee" }, } }, - { GCRY_CIPHER_AES192, + { PGPSYMKEYALGO_AES_192, "\x8e\x73\xb0\xf7\xda\x0e\x64\x52\xc8\x10\xf3\x2b" "\x80\x90\x79\xe5\x62\xf8\xea\xd2\x52\x2c\x6b\x7b", "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff", @@ -511,7 +499,7 @@ "\x4f\x78\xa7\xf6\xd2\x98\x09\x58\x5a\x97\xda\xec\x58\xc6\xb0\x50" }, } }, - { GCRY_CIPHER_AES256, + { PGPSYMKEYALGO_AES_256, "\x60\x3d\xeb\x10\x15\xca\x71\xbe\x2b\x73\xae\xf0\x85\x7d\x77\x81" "\x1f\x35\x2c\x07\x3b\x61\x08\xd7\x2d\x98\x10\xa3\x09\x14\xdf\xf4", "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff", @@ -539,8 +527,7 @@ size_t i; int j; - if (verbose) - fprintf(stderr, " Starting CTR cipher checks.\n"); + rpmlog(RPMLOG_INFO, " Starting CTR cipher checks.\n"); for (i = 0; i < sizeof(tv) / sizeof(tv[0]); i++) { err = gcry_cipher_open(&hde, tv[i].algo, GCRY_CIPHER_MODE_CTR, 0); if (!err) @@ -586,8 +573,7 @@ return; } - if (verbose) - fprintf(stderr, " checking CTR mode for %s [%i]\n", + rpmlog(RPMLOG_INFO, " checking CTR mode for %s [%i]\n", gcry_cipher_algo_name(tv[i].algo), tv[i].algo); for (j = 0; tv[i].data[j].inlen; j++) { err = gcry_cipher_encrypt(hde, out, MAX_DATA_LEN, @@ -685,8 +671,7 @@ gcry_cipher_close(hde); gcry_cipher_close(hdd); } - if (verbose) - fprintf(stderr, " Completed CTR cipher checks.\n"); + rpmlog(RPMLOG_INFO, " Completed CTR cipher checks.\n"); } static void check_cfb_cipher(void) @@ -704,7 +689,7 @@ } tv[] = { /* http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf */ - { GCRY_CIPHER_AES, + { PGPSYMKEYALGO_AES_128, "\x2b\x7e\x15\x16\x28\xae\xd2\xa6\xab\xf7\x15\x88\x09\xcf\x4f\x3c", "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f", { { "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96\xe9\x3d\x7e\x11\x73\x93\x17\x2a", @@ -721,7 +706,7 @@ "\xc0\x4b\x05\x35\x7c\x5d\x1c\x0e\xea\xc4\xc6\x6f\x9f\xf7\xf2\xe6" }, } }, - { GCRY_CIPHER_AES192, + { PGPSYMKEYALGO_AES_192, "\x8e\x73\xb0\xf7\xda\x0e\x64\x52\xc8\x10\xf3\x2b" "\x80\x90\x79\xe5\x62\xf8\xea\xd2\x52\x2c\x6b\x7b", "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f", @@ -739,7 +724,7 @@ "\xc0\x5f\x9f\x9c\xa9\x83\x4f\xa0\x42\xae\x8f\xba\x58\x4b\x09\xff" }, } }, - { GCRY_CIPHER_AES256, + { PGPSYMKEYALGO_AES_256, "\x60\x3d\xeb\x10\x15\xca\x71\xbe\x2b\x73\xae\xf0\x85\x7d\x77\x81" "\x1f\x35\x2c\x07\x3b\x61\x08\xd7\x2d\x98\x10\xa3\x09\x14\xdf\xf4", "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f", @@ -767,12 +752,10 @@ size_t i; int j; - if (verbose) - fprintf(stderr, " Starting CFB checks.\n"); + rpmlog(RPMLOG_INFO, " Starting CFB checks.\n"); for (i = 0; i < sizeof(tv) / sizeof(tv[0]); i++) { - if (verbose) - fprintf(stderr, " checking CFB mode for %s [%i]\n", + rpmlog(RPMLOG_INFO, " checking CFB mode for %s [%i]\n", gcry_cipher_algo_name(tv[i].algo), tv[i].algo); err = gcry_cipher_open(&hde, tv[i].algo, GCRY_CIPHER_MODE_CFB, 0); if (!err) @@ -852,8 +835,7 @@ gcry_cipher_close(hde); gcry_cipher_close(hdd); } - if (verbose) - fprintf(stderr, " Completed CFB checks.\n"); + rpmlog(RPMLOG_INFO, " Completed CFB checks.\n"); } static void check_ofb_cipher(void) @@ -871,7 +853,7 @@ } tv[] = { /* http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf */ - { GCRY_CIPHER_AES, + { PGPSYMKEYALGO_AES_128, "\x2b\x7e\x15\x16\x28\xae\xd2\xa6\xab\xf7\x15\x88\x09\xcf\x4f\x3c", "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f", { { "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96\xe9\x3d\x7e\x11\x73\x93\x17\x2a", @@ -888,7 +870,7 @@ "\x30\x4c\x65\x28\xf6\x59\xc7\x78\x66\xa5\x10\xd9\xc1\xd6\xae\x5e" }, } }, - { GCRY_CIPHER_AES192, + { PGPSYMKEYALGO_AES_192, "\x8e\x73\xb0\xf7\xda\x0e\x64\x52\xc8\x10\xf3\x2b" "\x80\x90\x79\xe5\x62\xf8\xea\xd2\x52\x2c\x6b\x7b", "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f", @@ -906,7 +888,7 @@ "\x6d\x9f\x20\x08\x57\xca\x6c\x3e\x9c\xac\x52\x4b\xd9\xac\xc9\x2a" }, } }, - { GCRY_CIPHER_AES256, + { PGPSYMKEYALGO_AES_256, "\x60\x3d\xeb\x10\x15\xca\x71\xbe\x2b\x73\xae\xf0\x85\x7d\x77\x81" "\x1f\x35\x2c\x07\x3b\x61\x08\xd7\x2d\x98\x10\xa3\x09\x14\xdf\xf4", "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f", @@ -934,12 +916,10 @@ size_t i; int j; - if (verbose) - fprintf(stderr, " Starting OFB checks.\n"); + rpmlog(RPMLOG_INFO, " Starting OFB checks.\n"); for (i = 0; i < sizeof(tv) / sizeof(tv[0]); i++) { - if (verbose) - fprintf(stderr, " checking OFB mode for %s [%i]\n", + rpmlog(RPMLOG_INFO, " checking OFB mode for %s [%i]\n", gcry_cipher_algo_name(tv[i].algo), tv[i].algo); err = gcry_cipher_open(&hde, tv[i].algo, GCRY_CIPHER_MODE_OFB, 0); if (!err) @@ -1074,8 +1054,7 @@ gcry_cipher_close(hde); gcry_cipher_close(hdd); } - if (verbose) - fprintf(stderr, " Completed OFB checks.\n"); + rpmlog(RPMLOG_INFO, " Completed OFB checks.\n"); } static void check_one_cipher(int algo, int mode, int flags) @@ -1170,26 +1149,26 @@ } -static void check_ciphers(void) +static void check_ciphers(pgpDig dig) { static int algos[] = { #if USE_BLOWFISH - GCRY_CIPHER_BLOWFISH, + PGPSYMKEYALGO_BLOWFISH, #endif #if USE_DES GCRY_CIPHER_DES, - GCRY_CIPHER_3DES, + PGPSYMKEYALGO_TRIPLE_DES, #endif #if USE_CAST5 - GCRY_CIPHER_CAST5, + PGPSYMKEYALGO_CAST5, #endif #if USE_AES - GCRY_CIPHER_AES, - GCRY_CIPHER_AES192, - GCRY_CIPHER_AES256, + PGPSYMKEYALGO_AES_128, + PGPSYMKEYALGO_AES_192, + PGPSYMKEYALGO_AES_256, #endif #if USE_TWOFISH - GCRY_CIPHER_TWOFISH, + PGPSYMKEYALGO_TWOFISH, GCRY_CIPHER_TWOFISH128, #endif #if USE_SERPENT @@ -1218,18 +1197,14 @@ }; int i; - if (verbose) - fprintf(stderr, "Starting Cipher checks.\n"); + rpmlog(RPMLOG_INFO, "Starting Cipher checks.\n"); for (i = 0; algos[i]; i++) { if (gcry_cipher_test_algo(algos[i]) && in_fips_mode) { - if (verbose) - fprintf(stderr, - " algorithm %d not available in fips mode\n", + rpmlog(RPMLOG_INFO, " algorithm %d not available in fips mode\n", algos[i]); continue; } - if (verbose) - fprintf(stderr, " checking %s [%i]\n", + rpmlog(RPMLOG_INFO, " checking %s [%i]\n", gcry_cipher_algo_name(algos[i]), gcry_cipher_map_name(gcry_cipher_algo_name(algos[i]))); @@ -1244,31 +1219,26 @@ for (i = 0; algos2[i]; i++) { if (gcry_cipher_test_algo(algos[i]) && in_fips_mode) { - if (verbose) - fprintf(stderr, - " algorithm %d not available in fips mode\n", + rpmlog(RPMLOG_INFO, " algorithm %d not available in fips mode\n", algos[i]); continue; } - if (verbose) - fprintf(stderr, " checking `%s'\n", + rpmlog(RPMLOG_INFO, " checking `%s'\n", gcry_cipher_algo_name(algos2[i])); check_one_cipher(algos2[i], GCRY_CIPHER_MODE_STREAM, 0); } /* we have now run all cipher's selftests */ - if (verbose) - fprintf(stderr, "Completed Cipher checks.\n"); + rpmlog(RPMLOG_INFO, "Completed Cipher checks.\n"); /* TODO: add some extra encryption to test the higher level functions */ } -static void check_cipher_modes(void) +static void check_cipher_modes(pgpDig dig) { - if (verbose) - fprintf(stderr, "Starting Cipher Mode checks.\n"); + rpmlog(RPMLOG_INFO, "Starting Cipher Mode checks.\n"); check_aes128_cbc_cts_cipher(); check_cbc_mac_cipher(); @@ -1276,8 +1246,7 @@ check_cfb_cipher(); check_ofb_cipher(); - if (verbose) - fprintf(stderr, "Completed Cipher Mode checks.\n"); + rpmlog(RPMLOG_INFO, "Completed Cipher Mode checks.\n"); } static void @@ -1338,7 +1307,7 @@ } -static void check_digests(void) +static void check_digests(pgpDig dig) { static struct algos { int md; @@ -1352,64 +1321,64 @@ "\xbd\xe5\x2c\xb3\x1d\xe3\x3e\x46\x24\x5e\x05\xfb\xdb\xd6\xfb\x24" }, { GCRY_MD_MD4, "message digest", "\xd9\x13\x0a\x81\x64\x54\x9f\xe8\x18\x87\x48\x06\xe1\xc7\x01\x4b" }, - { GCRY_MD_MD5, "", + { PGPHASHALGO_MD5, "", "\xD4\x1D\x8C\xD9\x8F\x00\xB2\x04\xE9\x80\x09\x98\xEC\xF8\x42\x7E" }, - { GCRY_MD_MD5, "a", + { PGPHASHALGO_MD5, "a", "\x0C\xC1\x75\xB9\xC0\xF1\xB6\xA8\x31\xC3\x99\xE2\x69\x77\x26\x61" }, - { GCRY_MD_MD5, "abc", + { PGPHASHALGO_MD5, "abc", "\x90\x01\x50\x98\x3C\xD2\x4F\xB0\xD6\x96\x3F\x7D\x28\xE1\x7F\x72" }, - { GCRY_MD_MD5, "message digest", + { PGPHASHALGO_MD5, "message digest", "\xF9\x6B\x69\x7D\x7C\xB7\x93\x8D\x52\x5A\x2F\x31\xAA\xF1\x61\xD0" }, - { GCRY_MD_SHA1, "abc", + { PGPHASHALGO_SHA1, "abc", "\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E" "\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D" }, - { GCRY_MD_SHA1, + { PGPHASHALGO_SHA1, "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", "\x84\x98\x3E\x44\x1C\x3B\xD2\x6E\xBA\xAE" "\x4A\xA1\xF9\x51\x29\xE5\xE5\x46\x70\xF1" }, - { GCRY_MD_SHA1, "!" /* kludge for "a"*1000000 */ , + { PGPHASHALGO_SHA1, "!" /* kludge for "a"*1000000 */ , "\x34\xAA\x97\x3C\xD4\xC4\xDA\xA4\xF6\x1E" "\xEB\x2B\xDB\xAD\x27\x31\x65\x34\x01\x6F" }, /* From RFC3874 */ - { GCRY_MD_SHA224, "abc", + { PGPHASHALGO_SHA224, "abc", "\x23\x09\x7d\x22\x34\x05\xd8\x22\x86\x42\xa4\x77\xbd\xa2\x55\xb3" "\x2a\xad\xbc\xe4\xbd\xa0\xb3\xf7\xe3\x6c\x9d\xa7" }, - { GCRY_MD_SHA224, + { PGPHASHALGO_SHA224, "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", "\x75\x38\x8b\x16\x51\x27\x76\xcc\x5d\xba\x5d\xa1\xfd\x89\x01\x50" "\xb0\xc6\x45\x5c\xb4\xf5\x8b\x19\x52\x52\x25\x25" }, - { GCRY_MD_SHA224, "!", + { PGPHASHALGO_SHA224, "!", "\x20\x79\x46\x55\x98\x0c\x91\xd8\xbb\xb4\xc1\xea\x97\x61\x8a\x4b" "\xf0\x3f\x42\x58\x19\x48\xb2\xee\x4e\xe7\xad\x67" }, - { GCRY_MD_SHA256, "abc", + { PGPHASHALGO_SHA256, "abc", "\xba\x78\x16\xbf\x8f\x01\xcf\xea\x41\x41\x40\xde\x5d\xae\x22\x23" "\xb0\x03\x61\xa3\x96\x17\x7a\x9c\xb4\x10\xff\x61\xf2\x00\x15\xad" }, - { GCRY_MD_SHA256, + { PGPHASHALGO_SHA256, "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", "\x24\x8d\x6a\x61\xd2\x06\x38\xb8\xe5\xc0\x26\x93\x0c\x3e\x60\x39" "\xa3\x3c\xe4\x59\x64\xff\x21\x67\xf6\xec\xed\xd4\x19\xdb\x06\xc1" }, - { GCRY_MD_SHA256, "!", + { PGPHASHALGO_SHA256, "!", "\xcd\xc7\x6e\x5c\x99\x14\xfb\x92\x81\xa1\xc7\xe2\x84\xd7\x3e\x67" "\xf1\x80\x9a\x48\xa4\x97\x20\x0e\x04\x6d\x39\xcc\xc7\x11\x2c\xd0" }, - { GCRY_MD_SHA384, "abc", + { PGPHASHALGO_SHA384, "abc", "\xcb\x00\x75\x3f\x45\xa3\x5e\x8b\xb5\xa0\x3d\x69\x9a\xc6\x50\x07" "\x27\x2c\x32\xab\x0e\xde\xd1\x63\x1a\x8b\x60\x5a\x43\xff\x5b\xed" "\x80\x86\x07\x2b\xa1\xe7\xcc\x23\x58\xba\xec\xa1\x34\xc8\x25\xa7" }, - { GCRY_MD_SHA512, "abc", + { PGPHASHALGO_SHA512, "abc", "\xDD\xAF\x35\xA1\x93\x61\x7A\xBA\xCC\x41\x73\x49\xAE\x20\x41\x31" "\x12\xE6\xFA\x4E\x89\xA9\x7E\xA2\x0A\x9E\xEE\xE6\x4B\x55\xD3\x9A" "\x21\x92\x99\x2A\x27\x4F\xC1\xA8\x36\xBA\x3C\x23\xA3\xFE\xEB\xBD" "\x45\x4D\x44\x23\x64\x3C\xE8\x0E\x2A\x9A\xC9\x4F\xA5\x4C\xA4\x9F" }, - { GCRY_MD_RMD160, "", + { PGPHASHALGO_RIPEMD160, "", "\x9c\x11\x85\xa5\xc5\xe9\xfc\x54\x61\x28" "\x08\x97\x7e\xe8\xf5\x48\xb2\x25\x8d\x31" }, - { GCRY_MD_RMD160, "a", + { PGPHASHALGO_RIPEMD160, "a", "\x0b\xdc\x9d\x2d\x25\x6b\x3e\xe9\xda\xae" "\x34\x7b\xe6\xf4\xdc\x83\x5a\x46\x7f\xfe" }, - { GCRY_MD_RMD160, "abc", + { PGPHASHALGO_RIPEMD160, "abc", "\x8e\xb2\x08\xf7\xe0\x5d\x98\x7a\x9b\x04" "\x4a\x8e\x98\xc6\xb0\x87\xf1\x5a\x0b\xfc" }, - { GCRY_MD_RMD160, "message digest", + { PGPHASHALGO_RIPEMD160, "message digest", "\x5d\x06\x89\xef\x49\xd2\xfa\xe5\x72\xb8" "\x81\xb1\x23\xa8\x5f\xfa\x21\x59\x5f\x36" }, { GCRY_MD_CRC32, "", "\x00\x00\x00\x00" }, @@ -1432,38 +1401,38 @@ { GCRY_MD_CRC24_RFC2440, "", "\xb7\x04\xce" }, { GCRY_MD_CRC24_RFC2440, "foo", "\x4f\xc2\x55" }, - { GCRY_MD_TIGER, "", + { PGPHASHALGO_TIGER192, "", "\x24\xF0\x13\x0C\x63\xAC\x93\x32\x16\x16\x6E\x76" "\xB1\xBB\x92\x5F\xF3\x73\xDE\x2D\x49\x58\x4E\x7A" }, - { GCRY_MD_TIGER, "abc", + { PGPHASHALGO_TIGER192, "abc", "\xF2\x58\xC1\xE8\x84\x14\xAB\x2A\x52\x7A\xB5\x41" "\xFF\xC5\xB8\xBF\x93\x5F\x7B\x95\x1C\x13\x29\x51" }, - { GCRY_MD_TIGER, "Tiger", + { PGPHASHALGO_TIGER192, "Tiger", "\x9F\x00\xF5\x99\x07\x23\x00\xDD\x27\x6A\xBB\x38" "\xC8\xEB\x6D\xEC\x37\x79\x0C\x11\x6F\x9D\x2B\xDF" }, - { GCRY_MD_TIGER, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefg" + { PGPHASHALGO_TIGER192, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefg" "hijklmnopqrstuvwxyz0123456789+-", "\x87\xFB\x2A\x90\x83\x85\x1C\xF7\x47\x0D\x2C\xF8" "\x10\xE6\xDF\x9E\xB5\x86\x44\x50\x34\xA5\xA3\x86" }, - { GCRY_MD_TIGER, "ABCDEFGHIJKLMNOPQRSTUVWXYZ=abcdef" + { PGPHASHALGO_TIGER192, "ABCDEFGHIJKLMNOPQRSTUVWXYZ=abcdef" "ghijklmnopqrstuvwxyz+0123456789", "\x46\x7D\xB8\x08\x63\xEB\xCE\x48\x8D\xF1\xCD\x12" "\x61\x65\x5D\xE9\x57\x89\x65\x65\x97\x5F\x91\x97" }, - { GCRY_MD_TIGER, "Tiger - A Fast New Hash Function, " + { PGPHASHALGO_TIGER192, "Tiger - A Fast New Hash Function, " "by Ross Anderson and Eli Biham", "\x0C\x41\x0A\x04\x29\x68\x86\x8A\x16\x71\xDA\x5A" "\x3F\xD2\x9A\x72\x5E\xC1\xE4\x57\xD3\xCD\xB3\x03" }, - { GCRY_MD_TIGER, "Tiger - A Fast New Hash Function, " + { PGPHASHALGO_TIGER192, "Tiger - A Fast New Hash Function, " "by Ross Anderson and Eli Biham, proceedings of Fa" "st Software Encryption 3, Cambridge.", "\xEB\xF5\x91\xD5\xAF\xA6\x55\xCE\x7F\x22\x89\x4F" "\xF8\x7F\x54\xAC\x89\xC8\x11\xB6\xB0\xDA\x31\x93" }, - { GCRY_MD_TIGER, "Tiger - A Fast New Hash Function, " + { PGPHASHALGO_TIGER192, "Tiger - A Fast New Hash Function, " "by Ross Anderson and Eli Biham, proceedings of Fa" "st Software Encryption 3, Cambridge, 1996.", "\x3D\x9A\xEB\x03\xD1\xBD\x1A\x63\x57\xB2\x77\x4D" "\xFD\x6D\x5B\x24\xDD\x68\x15\x1D\x50\x39\x74\xFC" }, - { GCRY_MD_TIGER, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefgh" + { PGPHASHALGO_TIGER192, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefgh" "ijklmnopqrstuvwxyz0123456789+-ABCDEFGHIJKLMNOPQRS" "TUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-", "\x00\xB8\x3E\xB4\xE5\x34\x40\xC5\x76\xAC\x6A\xAE" @@ -1566,20 +1535,16 @@ }; int i; - if (verbose) - fprintf(stderr, "Starting hash checks.\n"); + rpmlog(RPMLOG_INFO, "Starting hash checks.\n"); for (i = 0; algos[i].md; i++) { - if ((gcry_md_test_algo(algos[i].md) || algos[i].md == GCRY_MD_MD5) - && in_fips_mode) { - if (verbose) - fprintf(stderr, - " algorithm %d not available in fips mode\n", + if ((gcry_md_test_algo(algos[i].md) || algos[i].md == PGPHASHALGO_MD5) + && in_fips_mode) { + rpmlog(RPMLOG_INFO, " algorithm %d not available in fips mode\n", algos[i].md); continue; } - if (verbose) - fprintf(stderr, " checking %s [%i] for length %zi\n", + rpmlog(RPMLOG_INFO, " checking %s [%i] for length %zi\n", gcry_md_algo_name(algos[i].md), algos[i].md, !strcmp(algos[i].data, "!") ? @@ -1589,8 +1554,7 @@ algos[i].expect); } - if (verbose) - fprintf(stderr, "Completed hash checks.\n"); + rpmlog(RPMLOG_INFO, "Completed hash checks.\n"); } static void @@ -1647,7 +1611,7 @@ gcry_md_close(hd2); } -static void check_hmac(void) +static void check_hmac(pgpDig dig) { static struct algos { @@ -1657,20 +1621,20 @@ const char *expect; } algos[] = { - { GCRY_MD_MD5, "what do ya want for nothing?", "Jefe", + { PGPHASHALGO_MD5, "what do ya want for nothing?", "Jefe", "\x75\x0c\x78\x3e\x6a\xb0\xb5\x03\xea\xa8\x6e\x31\x0a\x5d\xb7\x38" }, - { GCRY_MD_MD5, + { PGPHASHALGO_MD5, "Hi There", "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b", "\x92\x94\x72\x7a\x36\x38\xbb\x1c\x13\xf4\x8e\xf8\x15\x8b\xfc\x9d" }, - { GCRY_MD_MD5, + { PGPHASHALGO_MD5, "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" "\xdd\xdd\xdd\xdd\xdd", "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA", "\x56\xbe\x34\x52\x1d\x14\x4c\x88\xdb\xb8\xc7\x33\xf0\xe8\xb3\xf6" }, - { GCRY_MD_MD5, + { PGPHASHALGO_MD5, "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" @@ -1678,10 +1642,10 @@ "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f" "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19", "\x69\x7e\xaf\x0a\xca\x3a\x3a\xea\x3a\x75\x16\x47\x46\xff\xaa\x79" }, - { GCRY_MD_MD5, "Test With Truncation", + { PGPHASHALGO_MD5, "Test With Truncation", "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c", "\x56\x46\x1e\xf2\x34\x2e\xdc\x00\xf9\xba\xb9\x95\x69\x0e\xfd\x4c" }, - { GCRY_MD_MD5, "Test Using Larger Than Block-Size Key - Hash Key First", + { PGPHASHALGO_MD5, "Test Using Larger Than Block-Size Key - Hash Key First", "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" @@ -1689,7 +1653,7 @@ "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" "\xaa\xaa\xaa\xaa\xaa", "\x6b\x1a\xb7\xfe\x4b\xd7\xbf\x8f\x0b\x62\xe6\xce\x61\xb9\xd0\xcd" }, - { GCRY_MD_MD5, + { PGPHASHALGO_MD5, "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" @@ -1698,16 +1662,16 @@ "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" "\xaa\xaa\xaa\xaa\xaa", "\x6f\x63\x0f\xad\x67\xcd\xa0\xee\x1f\xb1\xf5\x62\xdb\x3a\xa5\x3e", }, - { GCRY_MD_SHA256, "what do ya want for nothing?", "Jefe", + { PGPHASHALGO_SHA256, "what do ya want for nothing?", "Jefe", "\x5b\xdc\xc1\x46\xbf\x60\x75\x4e\x6a\x04\x24\x26\x08\x95\x75\xc7\x5a" "\x00\x3f\x08\x9d\x27\x39\x83\x9d\xec\x58\xb9\x64\xec\x38\x43" }, - { GCRY_MD_SHA256, + { PGPHASHALGO_SHA256, "Hi There", "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b" "\x0b\x0b\x0b", "\xb0\x34\x4c\x61\xd8\xdb\x38\x53\x5c\xa8\xaf\xce\xaf\x0b\xf1\x2b\x88" "\x1d\xc2\x00\xc9\x83\x3d\xa7\x26\xe9\x37\x6c\x2e\x32\xcf\xf7" }, - { GCRY_MD_SHA256, + { PGPHASHALGO_SHA256, "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" @@ -1716,7 +1680,7 @@ "\xAA\xAA\xAA\xAA", "\x77\x3e\xa9\x1e\x36\x80\x0e\x46\x85\x4d\xb8\xeb\xd0\x91\x81\xa7" "\x29\x59\x09\x8b\x3e\xf8\xc1\x22\xd9\x63\x55\x14\xce\xd5\x65\xfe" }, - { GCRY_MD_SHA256, + { PGPHASHALGO_SHA256, "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" @@ -1725,7 +1689,7 @@ "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19", "\x82\x55\x8a\x38\x9a\x44\x3c\x0e\xa4\xcc\x81\x98\x99\xf2\x08" "\x3a\x85\xf0\xfa\xa3\xe5\x78\xf8\x07\x7a\x2e\x3f\xf4\x67\x29\x66\x5b" }, - { GCRY_MD_SHA256, + { PGPHASHALGO_SHA256, "Test Using Larger Than Block-Size Key - Hash Key First", "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" @@ -1738,7 +1702,7 @@ "\xaa\xaa\xaa", "\x60\xe4\x31\x59\x1e\xe0\xb6\x7f\x0d\x8a\x26\xaa\xcb\xf5\xb7\x7f" "\x8e\x0b\xc6\x21\x37\x28\xc5\x14\x05\x46\x04\x0f\x0e\xe3\x7f\x54" }, - { GCRY_MD_SHA256, + { PGPHASHALGO_SHA256, "This is a test using a larger than block-size key and a larger than block-size data. The key needs to be hashed before being used by the HMAC algorithm.", "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" @@ -1751,16 +1715,16 @@ "\xaa\xaa\xaa", "\x9b\x09\xff\xa7\x1b\x94\x2f\xcb\x27\x63\x5f\xbc\xd5\xb0\xe9\x44" "\xbf\xdc\x63\x64\x4f\x07\x13\x93\x8a\x7f\x51\x53\x5c\x3a\x35\xe2" }, - { GCRY_MD_SHA224, "what do ya want for nothing?", "Jefe", + { PGPHASHALGO_SHA224, "what do ya want for nothing?", "Jefe", "\xa3\x0e\x01\x09\x8b\xc6\xdb\xbf\x45\x69\x0f\x3a\x7e\x9e\x6d\x0f" "\x8b\xbe\xa2\xa3\x9e\x61\x48\x00\x8f\xd0\x5e\x44" }, - { GCRY_MD_SHA224, + { PGPHASHALGO_SHA224, "Hi There", "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b" "\x0b\x0b\x0b", "\x89\x6f\xb1\x12\x8a\xbb\xdf\x19\x68\x32\x10\x7c\xd4\x9d\xf3\x3f\x47" "\xb4\xb1\x16\x99\x12\xba\x4f\x53\x68\x4b\x22" }, - { GCRY_MD_SHA224, + { PGPHASHALGO_SHA224, "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" @@ -1769,7 +1733,7 @@ "\xAA\xAA\xAA\xAA", "\x7f\xb3\xcb\x35\x88\xc6\xc1\xf6\xff\xa9\x69\x4d\x7d\x6a\xd2\x64" "\x93\x65\xb0\xc1\xf6\x5d\x69\xd1\xec\x83\x33\xea" }, - { GCRY_MD_SHA224, + { PGPHASHALGO_SHA224, "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" @@ -1778,7 +1742,7 @@ "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19", "\x6c\x11\x50\x68\x74\x01\x3c\xac\x6a\x2a\xbc\x1b\xb3\x82\x62" "\x7c\xec\x6a\x90\xd8\x6e\xfc\x01\x2d\xe7\xaf\xec\x5a" }, - { GCRY_MD_SHA224, + { PGPHASHALGO_SHA224, "Test Using Larger Than Block-Size Key - Hash Key First", "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" @@ -1791,7 +1755,7 @@ "\xaa\xaa\xaa", "\x95\xe9\xa0\xdb\x96\x20\x95\xad\xae\xbe\x9b\x2d\x6f\x0d\xbc\xe2" "\xd4\x99\xf1\x12\xf2\xd2\xb7\x27\x3f\xa6\x87\x0e" }, - { GCRY_MD_SHA224, + { PGPHASHALGO_SHA224, "This is a test using a larger than block-size key and a larger than block-size data. The key needs to be hashed before being used by the HMAC algorithm.", "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" @@ -1804,18 +1768,18 @@ "\xaa\xaa\xaa", "\x3a\x85\x41\x66\xac\x5d\x9f\x02\x3f\x54\xd5\x17\xd0\xb3\x9d\xbd" "\x94\x67\x70\xdb\x9c\x2b\x95\xc9\xf6\xf5\x65\xd1" }, - { GCRY_MD_SHA384, "what do ya want for nothing?", "Jefe", + { PGPHASHALGO_SHA384, "what do ya want for nothing?", "Jefe", "\xaf\x45\xd2\xe3\x76\x48\x40\x31\x61\x7f\x78\xd2\xb5\x8a\x6b\x1b" "\x9c\x7e\xf4\x64\xf5\xa0\x1b\x47\xe4\x2e\xc3\x73\x63\x22\x44\x5e" "\x8e\x22\x40\xca\x5e\x69\xe2\xc7\x8b\x32\x39\xec\xfa\xb2\x16\x49" }, - { GCRY_MD_SHA384, + { PGPHASHALGO_SHA384, "Hi There", "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b" "\x0b\x0b\x0b", "\xaf\xd0\x39\x44\xd8\x48\x95\x62\x6b\x08\x25\xf4\xab\x46\x90\x7f\x15" "\xf9\xda\xdb\xe4\x10\x1e\xc6\x82\xaa\x03\x4c\x7c\xeb\xc5\x9c\xfa\xea" "\x9e\xa9\x07\x6e\xde\x7f\x4a\xf1\x52\xe8\xb2\xfa\x9c\xb6" }, - { GCRY_MD_SHA384, + { PGPHASHALGO_SHA384, "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" @@ -1825,7 +1789,7 @@ "\x88\x06\x26\x08\xd3\xe6\xad\x8a\x0a\xa2\xac\xe0\x14\xc8\xa8\x6f" "\x0a\xa6\x35\xd9\x47\xac\x9f\xeb\xe8\x3e\xf4\xe5\x59\x66\x14\x4b" "\x2a\x5a\xb3\x9d\xc1\x38\x14\xb9\x4e\x3a\xb6\xe1\x01\xa3\x4f\x27" }, - { GCRY_MD_SHA384, + { PGPHASHALGO_SHA384, "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" @@ -1835,7 +1799,7 @@ "\x3e\x8a\x69\xb7\x78\x3c\x25\x85\x19\x33\xab\x62\x90\xaf\x6c\xa7" "\x7a\x99\x81\x48\x08\x50\x00\x9c\xc5\x57\x7c\x6e\x1f\x57\x3b\x4e" "\x68\x01\xdd\x23\xc4\xa7\xd6\x79\xcc\xf8\xa3\x86\xc6\x74\xcf\xfb" }, - { GCRY_MD_SHA384, + { PGPHASHALGO_SHA384, "Test Using Larger Than Block-Size Key - Hash Key First", "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" @@ -1849,7 +1813,7 @@ "\x4e\xce\x08\x44\x85\x81\x3e\x90\x88\xd2\xc6\x3a\x04\x1b\xc5\xb4" "\x4f\x9e\xf1\x01\x2a\x2b\x58\x8f\x3c\xd1\x1f\x05\x03\x3a\xc4\xc6" "\x0c\x2e\xf6\xab\x40\x30\xfe\x82\x96\x24\x8d\xf1\x63\xf4\x49\x52" }, - { GCRY_MD_SHA384, + { PGPHASHALGO_SHA384, "This is a test using a larger than block-size key and a larger than block-size data. The key needs to be hashed before being used by the HMAC algorithm.", "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" @@ -1863,12 +1827,12 @@ "\x66\x17\x17\x8e\x94\x1f\x02\x0d\x35\x1e\x2f\x25\x4e\x8f\xd3\x2c" "\x60\x24\x20\xfe\xb0\xb8\xfb\x9a\xdc\xce\xbb\x82\x46\x1e\x99\xc5" "\xa6\x78\xcc\x31\xe7\x99\x17\x6d\x38\x60\xe6\x11\x0c\x46\x52\x3e" }, - { GCRY_MD_SHA512, "what do ya want for nothing?", "Jefe", + { PGPHASHALGO_SHA512, "what do ya want for nothing?", "Jefe", "\x16\x4b\x7a\x7b\xfc\xf8\x19\xe2\xe3\x95\xfb\xe7\x3b\x56\xe0\xa3" "\x87\xbd\x64\x22\x2e\x83\x1f\xd6\x10\x27\x0c\xd7\xea\x25\x05\x54" "\x97\x58\xbf\x75\xc0\x5a\x99\x4a\x6d\x03\x4f\x65\xf8\xf0\xe6\xfd" "\xca\xea\xb1\xa3\x4d\x4a\x6b\x4b\x63\x6e\x07\x0a\x38\xbc\xe7\x37" }, - { GCRY_MD_SHA512, + { PGPHASHALGO_SHA512, "Hi There", "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b" "\x0b\x0b\x0b", @@ -1876,7 +1840,7 @@ "\x23\x79\xf4\xe2\xce\x4e\xc2\x78\x7a\xd0\xb3\x05\x45\xe1\x7c\xde" "\xda\xa8\x33\xb7\xd6\xb8\xa7\x02\x03\x8b\x27\x4e\xae\xa3\xf4\xe4" "\xbe\x9d\x91\x4e\xeb\x61\xf1\x70\x2e\x69\x6c\x20\x3a\x12\x68\x54" }, - { GCRY_MD_SHA512, + { PGPHASHALGO_SHA512, "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" @@ -1887,7 +1851,7 @@ "\xb1\xb5\xdb\xdd\x8e\xe8\x1a\x36\x55\xf8\x3e\x33\xb2\x27\x9d\x39" "\xbf\x3e\x84\x82\x79\xa7\x22\xc8\x06\xb4\x85\xa4\x7e\x67\xc8\x07" "\xb9\x46\xa3\x37\xbe\xe8\x94\x26\x74\x27\x88\x59\xe1\x32\x92\xfb" }, - { GCRY_MD_SHA512, + { PGPHASHALGO_SHA512, "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" @@ -1898,7 +1862,7 @@ "\xe5\x76\xd9\x7f\xf9\x4b\x87\x2d\xe7\x6f\x80\x50\x36\x1e\xe3\xdb" "\xa9\x1c\xa5\xc1\x1a\xa2\x5e\xb4\xd6\x79\x27\x5c\xc5\x78\x80\x63" "\xa5\xf1\x97\x41\x12\x0c\x4f\x2d\xe2\xad\xeb\xeb\x10\xa2\x98\xdd" }, - { GCRY_MD_SHA512, + { PGPHASHALGO_SHA512, "Test Using Larger Than Block-Size Key - Hash Key First", "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" @@ -1913,7 +1877,7 @@ "\x9b\x46\xd1\xf4\x1b\x4a\xee\xc1\x12\x1b\x01\x37\x83\xf8\xf3\x52" "\x6b\x56\xd0\x37\xe0\x5f\x25\x98\xbd\x0f\xd2\x21\x5d\x6a\x1e\x52" "\x95\xe6\x4f\x73\xf6\x3f\x0a\xec\x8b\x91\x5a\x98\x5d\x78\x65\x98" }, - { GCRY_MD_SHA512, + { PGPHASHALGO_SHA512, "This is a test using a larger than block-size key and a larger than block-size data. The key needs to be hashed before being used by the HMAC algorithm.", "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" @@ -1932,20 +1896,16 @@ }; int i; - if (verbose) - fprintf(stderr, "Starting hashed MAC checks.\n"); + rpmlog(RPMLOG_INFO, "Starting hashed MAC checks.\n"); for (i = 0; algos[i].md; i++) { - if ((gcry_md_test_algo(algos[i].md) || algos[i].md == GCRY_MD_MD5) - && in_fips_mode) { - if (verbose) - fprintf(stderr, - " algorithm %d not available in fips mode\n", + if ((gcry_md_test_algo(algos[i].md) || algos[i].md == PGPHASHALGO_MD5) + && in_fips_mode) { + rpmlog(RPMLOG_INFO, " algorithm %d not available in fips mode\n", algos[i].md); continue; } - if (verbose) - fprintf(stderr, + rpmlog(RPMLOG_INFO, " checking %s [%i] for %zi byte key and %zi byte data\n", gcry_md_algo_name(algos[i].md), algos[i].md, @@ -1956,8 +1916,7 @@ algos[i].expect); } - if (verbose) - fprintf(stderr, "Completed hashed MAC checks.\n"); + rpmlog(RPMLOG_INFO, "Completed hashed MAC checks.\n"); } /* Check that the signature SIG matches the hash HASH. PKEY is the @@ -1981,7 +1940,7 @@ /* Test the public key sign function using the private ket SKEY. PKEY is used for verification. */ -static void check_pubkey_sign(int n, gcry_sexp_t skey, gcry_sexp_t pkey) +static void check_pubkey_sign(pgpDig dig, int n, gcry_sexp_t skey, gcry_sexp_t pkey) { gcry_error_t rc; gcry_sexp_t sig, badhash, hash; @@ -2031,8 +1990,7 @@ die("converting data failed: %s\n", gpg_strerror(rc)); for (dataidx = 0; datas[dataidx].data; dataidx++) { - if (verbose) - fprintf(stderr, " signature test %d\n", dataidx); + rpmlog(RPMLOG_INFO, " signature test %d\n", dataidx); rc = gcry_sexp_sscan(&hash, NULL, datas[dataidx].data, strlen(datas[dataidx].data)); @@ -2056,7 +2014,7 @@ } static void -check_pubkey_grip(int n, const unsigned char *grip, +check_pubkey_grip(pgpDig dig, int n, const unsigned char *grip, gcry_sexp_t skey, gcry_sexp_t pkey) { unsigned char sgrip[20], pgrip[20]; @@ -2072,16 +2030,16 @@ } static void -do_check_one_pubkey(int n, gcry_sexp_t skey, gcry_sexp_t pkey, +do_check_one_pubkey(pgpDig dig, int n, gcry_sexp_t skey, gcry_sexp_t pkey, const unsigned char *grip, int flags) { if (flags & FLAG_SIGN) - check_pubkey_sign(n, skey, pkey); + check_pubkey_sign(dig, n, skey, pkey); if (grip && (flags & FLAG_GRIP)) - check_pubkey_grip(n, grip, skey, pkey); + check_pubkey_grip(dig, n, grip, skey, pkey); } -static void check_one_pubkey(int n, test_spec_pubkey_t spec) +static void check_one_pubkey(pgpDig dig, int n, test_spec_pubkey_t spec) { gcry_error_t err = GPG_ERR_NO_ERROR; gcry_sexp_t skey, pkey; @@ -2094,7 +2052,7 @@ if (err) die("converting sample key failed: %s\n", gpg_strerror(err)); - do_check_one_pubkey(n, skey, pkey, + do_check_one_pubkey(dig, n, skey, pkey, (const unsigned char *) spec.key.grip, spec.flags); gcry_sexp_release(skey); @@ -2105,8 +2063,7 @@ { gcry_sexp_t key_spec, key, pub_key, sec_key; int rc; - if (verbose) - fprintf(stderr, " generating RSA key:"); + rpmlog(RPMLOG_INFO, " generating RSA key:"); rc = gcry_sexp_new(&key_spec, in_fips_mode ? "(genkey (rsa (nbits 4:1024)))" : "(genkey (rsa (nbits 4:1024)(transient-key)))", @@ -2131,20 +2088,20 @@ *skey = sec_key; } -static void check_one_pubkey_new(int n) +static void check_one_pubkey_new(pgpDig dig, int n) { gcry_sexp_t skey, pkey; get_keys_new(&pkey, &skey); - do_check_one_pubkey(n, skey, pkey, NULL, FLAG_SIGN | FLAG_CRYPT); + do_check_one_pubkey(dig, n, skey, pkey, NULL, FLAG_SIGN | FLAG_CRYPT); } /* Run all tests for the public key functions. */ -static void check_pubkey(void) +static void check_pubkey(pgpDig dig) { test_spec_pubkey_t pubkeys[] = { { - GCRY_PK_RSA, FLAG_CRYPT | FLAG_SIGN, + PGPPUBKEYALGO_RSA, FLAG_CRYPT | FLAG_SIGN, {"(private-key\n" " (rsa\n" @@ -2176,7 +2133,7 @@ "\xa2\x5d\x3d\x69\xf8\x6d\x37\xa4\xf9\x39"} }, { - GCRY_PK_DSA, FLAG_SIGN, + PGPPUBKEYALGO_DSA, FLAG_SIGN, {"(private-key\n" " (DSA\n" @@ -2215,7 +2172,7 @@ "\x4a\xa6\xf9\xeb\x23\xbf\xa9\x12\x2d\x5b"} }, { - GCRY_PK_ELG, FLAG_SIGN | FLAG_CRYPT, + PGPPUBKEYALGO_ELGAMAL, FLAG_SIGN | FLAG_CRYPT, {"(private-key\n" " (ELG\n" @@ -2247,56 +2204,46 @@ }, }; size_t i; - if (verbose) - fprintf(stderr, "Starting public key checks.\n"); + rpmlog(RPMLOG_INFO, "Starting public key checks.\n"); for (i = 0; i < sizeof(pubkeys) / sizeof(*pubkeys); i++) if (pubkeys[i].id) { if (gcry_pk_test_algo(pubkeys[i].id) && in_fips_mode) { - if (verbose) - fprintf(stderr, - " algorithm %d not available in fips mode\n", + rpmlog(RPMLOG_INFO, " algorithm %d not available in fips mode\n", pubkeys[i].id); continue; } - check_one_pubkey(i, pubkeys[i]); + check_one_pubkey(dig, i, pubkeys[i]); } - if (verbose) - fprintf(stderr, "Completed public key checks.\n"); + rpmlog(RPMLOG_INFO, "Completed public key checks.\n"); - if (verbose) - fprintf(stderr, "Starting additional public key checks.\n"); + rpmlog(RPMLOG_INFO, "Starting additional public key checks.\n"); for (i = 0; i < sizeof(pubkeys) / sizeof(*pubkeys); i++) if (pubkeys[i].id) { if (gcry_pk_test_algo(pubkeys[i].id) && in_fips_mode) { - if (verbose) - fprintf(stderr, - " algorithm %d not available in fips mode\n", + rpmlog(RPMLOG_INFO, " algorithm %d not available in fips mode\n", pubkeys[i].id); continue; } - check_one_pubkey_new(i); + check_one_pubkey_new(dig, i); } - if (verbose) - fprintf(stderr, "Completed additional public key checks.\n"); + rpmlog(RPMLOG_INFO, "Completed additional public key checks.\n"); } -static int rpmgcPubkeyTests(pgpDig dig) +static int rpmgcBasicTests(pgpDig dig) { gpg_error_t err; - if (selftest_only) - verbose += 2; - if (rpmIsDebug()) { - debug = 1; - verbose++; - } else if (rpmIsVerbose()) - verbose++; + if (selftest_only) { + rpmIncreaseVerbosity(); + rpmIncreaseVerbosity(); + } -fprintf(stderr, "%s: debug %d verbose %d use_fips %d in_fips_mode %d selftest_only %d\n", -__FUNCTION__, debug, verbose, use_fips, in_fips_mode, selftest_only); +fprintf(stderr, "%s: use_fips %d in_fips_mode %d selftest_only %d\n", +__FUNCTION__, use_fips, in_fips_mode, selftest_only); - gcry_control(GCRYCTL_SET_VERBOSITY, (int) verbose); + if (rpmIsVerbose()) + gcry_control(GCRYCTL_SET_VERBOSITY, 3); if (use_fips) gcry_control(GCRYCTL_FORCE_FIPS_MODE, 0); @@ -2310,21 +2257,21 @@ if (!in_fips_mode) gcry_control(GCRYCTL_DISABLE_SECMEM, 0); - if (verbose) + if (rpmIsVerbose()) gcry_set_progress_handler(progress_handler, NULL); gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0); - if (debug) + if (rpmIsDebug() || _pgp_debug) gcry_control(GCRYCTL_SET_DEBUG_FLAGS, 1u, 0); /* No valuable keys are create, so we can speed up our RNG. */ gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0); if (!selftest_only) { - check_ciphers(); - check_cipher_modes(); - check_digests(); - check_hmac(); - check_pubkey(); + check_ciphers(dig); + check_cipher_modes(dig); + check_digests(dig); + check_hmac(dig); + check_pubkey(dig); } @@ -2338,12 +2285,12 @@ fail("not in operational state after self-test\n"); /* Get us into the error state. */ - err = gcry_md_open(&md, GCRY_MD_SHA1, 0); + err = gcry_md_open(&md, PGPHASHALGO_SHA1, 0); if (err) fail("failed to open SHA-1 hash context: %s\n", gpg_strerror(err)); else { - err = gcry_md_enable(md, GCRY_MD_SHA256); + err = gcry_md_enable(md, PGPHASHALGO_SHA256); if (err) fail("failed to add SHA-256 hash context: %s\n", gpg_strerror(err)); @@ -2374,9 +2321,7 @@ fail("running self-test failed\n"); } - if (verbose) - fprintf(stderr, "\nAll tests completed. Errors: %i\n", - error_count); + rpmlog(RPMLOG_INFO, "\nAll tests completed. Errors: %i\n", error_count); if (in_fips_mode && !gcry_fips_mode_active()) fprintf(stderr, "FIPS mode is not anymore active\n"); @@ -3079,7 +3024,8 @@ } #endif /* NOTYET */ -static int pgpDigRSATests(pgpDig dig) +#if defined(_RPMSSL_INTERNAL) +static int rpmsslRSATests(pgpDig dig) { int ret = -1; /* assume failure */ @@ -3162,6 +3108,7 @@ return ret; } +#endif /* _RPMSSL_INTERNAL */ /*==============================================================*/ @@ -3323,7 +3270,7 @@ #if defined(_RPMSSL_INTERNAL) dig = _rpmsslInit(); rc = 1; /* assume success */ - if (pgpDigRSATests(dig) <= 0) + if (rpmsslRSATests(dig) <= 0) rc = 0; dig = _rpmsslFini(dig); if (rc <= 0) @@ -3333,7 +3280,7 @@ #if defined(_RPMGC_INTERNAL) dig = _rpmgcInit(); rc = 1; /* assume success */ - if (rpmgcPubkeyTests(dig)) + if (rpmgcBasicTests(dig)) rc = 0; dig = _rpmgcFini(dig); if (rc <= 0) @@ -3343,7 +3290,7 @@ #if defined(_RPMNSS_INTERNAL) dig = _rpmnssInit(); rc = 1; /* assume success */ - if (pgpDigRSATests(dig) <= 0) + if (rpmsslRSATests(dig) <= 0) rc = 0; dig = _rpmnssFini(dig); if (rc <= 0) @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
