No licence.
authormiod <miod@openbsd.org>
Tue, 15 Apr 2014 18:10:10 +0000 (18:10 +0000)
committermiod <miod@openbsd.org>
Tue, 15 Apr 2014 18:10:10 +0000 (18:10 +0000)
lib/libcrypto/bn/divtest.c [deleted file]
lib/libcrypto/jpake/jpaketest.c [deleted file]
lib/libcrypto/rsa/rsa_test.c [deleted file]
lib/libcrypto/srp/srptest.c [deleted file]
lib/libcrypto/whrlpool/wp_test.c [deleted file]
lib/libssl/src/crypto/bn/divtest.c [deleted file]
lib/libssl/src/crypto/jpake/jpaketest.c [deleted file]
lib/libssl/src/crypto/rsa/rsa_test.c [deleted file]
lib/libssl/src/crypto/srp/srptest.c [deleted file]
lib/libssl/src/crypto/whrlpool/wp_test.c [deleted file]

diff --git a/lib/libcrypto/bn/divtest.c b/lib/libcrypto/bn/divtest.c
deleted file mode 100644 (file)
index d3fc688..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <openssl/bn.h>
-#include <openssl/rand.h>
-
-static int Rand(n)
-{
-    unsigned char x[2];
-    RAND_pseudo_bytes(x,2);
-    return (x[0] + 2*x[1]);
-}
-
-static void bug(char *m, BIGNUM *a, BIGNUM *b)
-{
-    printf("%s!\na=",m);
-    BN_print_fp(stdout, a);
-    printf("\nb=");
-    BN_print_fp(stdout, b);
-    printf("\n");
-    fflush(stdout);
-}
-
-main()
-{
-    BIGNUM *a=BN_new(), *b=BN_new(), *c=BN_new(), *d=BN_new(),
-       *C=BN_new(), *D=BN_new();
-    BN_RECP_CTX *recp=BN_RECP_CTX_new();
-    BN_CTX *ctx=BN_CTX_new();
-
-    for(;;) {
-       BN_pseudo_rand(a,Rand(),0,0);
-       BN_pseudo_rand(b,Rand(),0,0);
-       if (BN_is_zero(b)) continue;
-
-       BN_RECP_CTX_set(recp,b,ctx);
-       if (BN_div(C,D,a,b,ctx) != 1)
-           bug("BN_div failed",a,b);
-       if (BN_div_recp(c,d,a,recp,ctx) != 1)
-           bug("BN_div_recp failed",a,b);
-       else if (BN_cmp(c,C) != 0 || BN_cmp(c,C) != 0)
-           bug("mismatch",a,b);
-    }
-}
diff --git a/lib/libcrypto/jpake/jpaketest.c b/lib/libcrypto/jpake/jpaketest.c
deleted file mode 100644 (file)
index eaba75e..0000000
+++ /dev/null
@@ -1,192 +0,0 @@
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_NO_JPAKE
-
-#include <stdio.h>
-
-int main(int argc, char *argv[])
-{
-    printf("No J-PAKE support\n");
-    return(0);
-}
-
-#else
-
-#include <openssl/jpake.h>
-#include <openssl/err.h>
-
-static void showbn(const char *name, const BIGNUM *bn)
-    {
-    fputs(name, stdout);
-    fputs(" = ", stdout);
-    BN_print_fp(stdout, bn);
-    putc('\n', stdout);
-    }
-
-static int run_jpake(JPAKE_CTX *alice, JPAKE_CTX *bob)
-    {
-    JPAKE_STEP1 alice_s1;
-    JPAKE_STEP1 bob_s1;
-    JPAKE_STEP2 alice_s2;
-    JPAKE_STEP2 bob_s2;
-    JPAKE_STEP3A alice_s3a;
-    JPAKE_STEP3B bob_s3b;
-
-   /* Alice -> Bob: step 1 */
-    puts("A->B s1");
-    JPAKE_STEP1_init(&alice_s1);
-    JPAKE_STEP1_generate(&alice_s1, alice);
-    if(!JPAKE_STEP1_process(bob, &alice_s1))
-       {
-       printf("Bob fails to process Alice's step 1\n");
-       ERR_print_errors_fp(stdout);
-       return 1;
-       }
-    JPAKE_STEP1_release(&alice_s1);
-
-   /* Bob -> Alice: step 1 */
-    puts("B->A s1");
-    JPAKE_STEP1_init(&bob_s1);
-    JPAKE_STEP1_generate(&bob_s1, bob);
-    if(!JPAKE_STEP1_process(alice, &bob_s1))
-       {
-       printf("Alice fails to process Bob's step 1\n");
-       ERR_print_errors_fp(stdout);
-       return 2;
-       }
-    JPAKE_STEP1_release(&bob_s1);
-
-   /* Alice -> Bob: step 2 */
-    puts("A->B s2");
-    JPAKE_STEP2_init(&alice_s2);
-    JPAKE_STEP2_generate(&alice_s2, alice);
-    if(!JPAKE_STEP2_process(bob, &alice_s2))
-       {
-       printf("Bob fails to process Alice's step 2\n");
-       ERR_print_errors_fp(stdout);
-       return 3;
-       }
-    JPAKE_STEP2_release(&alice_s2);
-
-   /* Bob -> Alice: step 2 */
-    puts("B->A s2");
-    JPAKE_STEP2_init(&bob_s2);
-    JPAKE_STEP2_generate(&bob_s2, bob);
-    if(!JPAKE_STEP2_process(alice, &bob_s2))
-       {
-       printf("Alice fails to process Bob's step 2\n");
-       ERR_print_errors_fp(stdout);
-       return 4;
-       }
-    JPAKE_STEP2_release(&bob_s2);
-
-    showbn("Alice's key", JPAKE_get_shared_key(alice));
-    showbn("Bob's key  ", JPAKE_get_shared_key(bob));
-
-   /* Alice -> Bob: step 3a */
-    puts("A->B s3a");
-    JPAKE_STEP3A_init(&alice_s3a);
-    JPAKE_STEP3A_generate(&alice_s3a, alice);
-    if(!JPAKE_STEP3A_process(bob, &alice_s3a))
-       {
-       printf("Bob fails to process Alice's step 3a\n");
-       ERR_print_errors_fp(stdout);
-       return 5;
-       }
-    JPAKE_STEP3A_release(&alice_s3a);
-    
-   /* Bob -> Alice: step 3b */
-    puts("B->A s3b");
-    JPAKE_STEP3B_init(&bob_s3b);
-    JPAKE_STEP3B_generate(&bob_s3b, bob);
-    if(!JPAKE_STEP3B_process(alice, &bob_s3b))
-       {
-       printf("Alice fails to process Bob's step 3b\n");
-       ERR_print_errors_fp(stdout);
-       return 6;
-       }
-    JPAKE_STEP3B_release(&bob_s3b);
-
-    return 0;
-    }
-
-int main(int argc, char **argv)
-    {
-    JPAKE_CTX *alice;
-    JPAKE_CTX *bob;
-    BIGNUM *p = NULL;
-    BIGNUM *g = NULL;
-    BIGNUM *q = NULL;
-    BIGNUM *secret = BN_new();
-    BIO *bio_err;
-
-    bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
-
-    CRYPTO_malloc_debug_init();
-    CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);
-    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-
-    ERR_load_crypto_strings();
-
-    /*
-    BN_hex2bn(&p, "fd7f53811d75122952df4a9c2eece4e7f611b7523cef4400c31e3f80b6512669455d402251fb593d8d58fabfc5f5ba30f6cb9b556cd7813b801d346ff26660b76b9950a5a49f9fe8047b1022c24fbba9d7feb7c61bf83b57e7c6a8a6150f04fb83f6d3c51ec3023554135a169132f675f3ae2b61d72aeff22203199dd14801c7");
-    BN_hex2bn(&g, "f7e1a085d69b3ddecbbcab5c36b857b97994afbbfa3aea82f9574c0b3d0782675159578ebad4594fe67107108180b449167123e84c281613b7cf09328cc8a6e13c167a8b547c8d28e0a3ae1e2bb3a675916ea37f0bfa213562f1fb627a01243bcca4f1bea8519089a883dfe15ae59f06928b665e807b552564014c3bfecf492a");
-    BN_hex2bn(&q, "9760508f15230bccb292b982a2eb840bf0581cf5");
-    */
-    /*
-    p = BN_new();
-    BN_generate_prime(p, 1024, 1, NULL, NULL, NULL, NULL);
-    */
-   /* Use a safe prime for p (that we found earlier) */
-    BN_hex2bn(&p, "F9E5B365665EA7A05A9C534502780FEE6F1AB5BD4F49947FD036DBD7E905269AF46EF28B0FC07487EE4F5D20FB3C0AF8E700F3A2FA3414970CBED44FEDFF80CE78D800F184BB82435D137AADA2C6C16523247930A63B85661D1FC817A51ACD96168E95898A1F83A79FFB529368AA7833ABD1B0C3AEDDB14D2E1A2F71D99F763F");
-    showbn("p", p);
-    g = BN_new();
-    BN_set_word(g, 2);
-    showbn("g", g);
-    q = BN_new();
-    BN_rshift1(q, p);
-    showbn("q", q);
-
-    BN_rand(secret, 32, -1, 0);
-
-   /* A normal run, expect this to work... */
-    alice = JPAKE_CTX_new("Alice", "Bob", p, g, q, secret);
-    bob = JPAKE_CTX_new("Bob", "Alice", p, g, q, secret);
-
-    if(run_jpake(alice, bob) != 0)
-       {
-       fprintf(stderr, "Plain JPAKE run failed\n");
-       return 1;
-       }
-
-    JPAKE_CTX_free(bob);
-    JPAKE_CTX_free(alice);
-
-   /* Now give Alice and Bob different secrets */
-    alice = JPAKE_CTX_new("Alice", "Bob", p, g, q, secret);
-    BN_add_word(secret, 1);
-    bob = JPAKE_CTX_new("Bob", "Alice", p, g, q, secret);
-
-    if(run_jpake(alice, bob) != 5)
-       {
-       fprintf(stderr, "Mismatched secret JPAKE run failed\n");
-       return 1;
-       }
-
-    JPAKE_CTX_free(bob);
-    JPAKE_CTX_free(alice);
-
-    BN_free(secret);
-    BN_free(q);
-    BN_free(g);
-    BN_free(p);
-
-    CRYPTO_cleanup_all_ex_data();
-    ERR_remove_thread_state(NULL);
-    ERR_free_strings();
-    CRYPTO_mem_leaks(bio_err);
-
-    return 0;
-    }
-
-#endif
diff --git a/lib/libcrypto/rsa/rsa_test.c b/lib/libcrypto/rsa/rsa_test.c
deleted file mode 100644 (file)
index c8705a0..0000000
+++ /dev/null
@@ -1,340 +0,0 @@
-/* test vectors from p1ovect1.txt */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "e_os.h"
-
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-#include <openssl/bn.h>
-#ifdef OPENSSL_NO_RSA
-int main(int argc, char *argv[])
-{
-    printf("No RSA support\n");
-    return(0);
-}
-#else
-#include <openssl/rsa.h>
-
-#define SetKey \
-  key->n = BN_bin2bn(n, sizeof(n)-1, key->n); \
-  key->e = BN_bin2bn(e, sizeof(e)-1, key->e); \
-  key->d = BN_bin2bn(d, sizeof(d)-1, key->d); \
-  key->p = BN_bin2bn(p, sizeof(p)-1, key->p); \
-  key->q = BN_bin2bn(q, sizeof(q)-1, key->q); \
-  key->dmp1 = BN_bin2bn(dmp1, sizeof(dmp1)-1, key->dmp1); \
-  key->dmq1 = BN_bin2bn(dmq1, sizeof(dmq1)-1, key->dmq1); \
-  key->iqmp = BN_bin2bn(iqmp, sizeof(iqmp)-1, key->iqmp); \
-  memcpy(c, ctext_ex, sizeof(ctext_ex) - 1); \
-  return (sizeof(ctext_ex) - 1);
-
-static int key1(RSA *key, unsigned char *c)
-    {
-    static unsigned char n[] =
-"\x00\xAA\x36\xAB\xCE\x88\xAC\xFD\xFF\x55\x52\x3C\x7F\xC4\x52\x3F"
-"\x90\xEF\xA0\x0D\xF3\x77\x4A\x25\x9F\x2E\x62\xB4\xC5\xD9\x9C\xB5"
-"\xAD\xB3\x00\xA0\x28\x5E\x53\x01\x93\x0E\x0C\x70\xFB\x68\x76\x93"
-"\x9C\xE6\x16\xCE\x62\x4A\x11\xE0\x08\x6D\x34\x1E\xBC\xAC\xA0\xA1"
-"\xF5";
-
-    static unsigned char e[] = "\x11";
-
-    static unsigned char d[] =
-"\x0A\x03\x37\x48\x62\x64\x87\x69\x5F\x5F\x30\xBC\x38\xB9\x8B\x44"
-"\xC2\xCD\x2D\xFF\x43\x40\x98\xCD\x20\xD8\xA1\x38\xD0\x90\xBF\x64"
-"\x79\x7C\x3F\xA7\xA2\xCD\xCB\x3C\xD1\xE0\xBD\xBA\x26\x54\xB4\xF9"
-"\xDF\x8E\x8A\xE5\x9D\x73\x3D\x9F\x33\xB3\x01\x62\x4A\xFD\x1D\x51";
-
-    static unsigned char p[] =
-"\x00\xD8\x40\xB4\x16\x66\xB4\x2E\x92\xEA\x0D\xA3\xB4\x32\x04\xB5"
-"\xCF\xCE\x33\x52\x52\x4D\x04\x16\xA5\xA4\x41\xE7\x00\xAF\x46\x12"
-"\x0D";
-    
-    static unsigned char q[] =
-"\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9"
-"\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5A\x0F\x20\x35\x02\x8B\x9D"
-"\x89";
-
-    static unsigned char dmp1[] =
-"\x59\x0B\x95\x72\xA2\xC2\xA9\xC4\x06\x05\x9D\xC2\xAB\x2F\x1D\xAF"
-"\xEB\x7E\x8B\x4F\x10\xA7\x54\x9E\x8E\xED\xF5\xB4\xFC\xE0\x9E\x05";
-
-    static unsigned char dmq1[] =
-"\x00\x8E\x3C\x05\x21\xFE\x15\xE0\xEA\x06\xA3\x6F\xF0\xF1\x0C\x99"
-"\x52\xC3\x5B\x7A\x75\x14\xFD\x32\x38\xB8\x0A\xAD\x52\x98\x62\x8D"
-"\x51";
-
-    static unsigned char iqmp[] =
-"\x36\x3F\xF7\x18\x9D\xA8\xE9\x0B\x1D\x34\x1F\x71\xD0\x9B\x76\xA8"
-"\xA9\x43\xE1\x1D\x10\xB2\x4D\x24\x9F\x2D\xEA\xFE\xF8\x0C\x18\x26";
-
-    static unsigned char ctext_ex[] =
-"\x1b\x8f\x05\xf9\xca\x1a\x79\x52\x6e\x53\xf3\xcc\x51\x4f\xdb\x89"
-"\x2b\xfb\x91\x93\x23\x1e\x78\xb9\x92\xe6\x8d\x50\xa4\x80\xcb\x52"
-"\x33\x89\x5c\x74\x95\x8d\x5d\x02\xab\x8c\x0f\xd0\x40\xeb\x58\x44"
-"\xb0\x05\xc3\x9e\xd8\x27\x4a\x9d\xbf\xa8\x06\x71\x40\x94\x39\xd2";
-
-    SetKey;
-    }
-
-static int key2(RSA *key, unsigned char *c)
-    {
-    static unsigned char n[] =
-"\x00\xA3\x07\x9A\x90\xDF\x0D\xFD\x72\xAC\x09\x0C\xCC\x2A\x78\xB8"
-"\x74\x13\x13\x3E\x40\x75\x9C\x98\xFA\xF8\x20\x4F\x35\x8A\x0B\x26"
-"\x3C\x67\x70\xE7\x83\xA9\x3B\x69\x71\xB7\x37\x79\xD2\x71\x7B\xE8"
-"\x34\x77\xCF";
-
-    static unsigned char e[] = "\x3";
-
-    static unsigned char d[] =
-"\x6C\xAF\xBC\x60\x94\xB3\xFE\x4C\x72\xB0\xB3\x32\xC6\xFB\x25\xA2"
-"\xB7\x62\x29\x80\x4E\x68\x65\xFC\xA4\x5A\x74\xDF\x0F\x8F\xB8\x41"
-"\x3B\x52\xC0\xD0\xE5\x3D\x9B\x59\x0F\xF1\x9B\xE7\x9F\x49\xDD\x21"
-"\xE5\xEB";
-
-    static unsigned char p[] =
-"\x00\xCF\x20\x35\x02\x8B\x9D\x86\x98\x40\xB4\x16\x66\xB4\x2E\x92"
-"\xEA\x0D\xA3\xB4\x32\x04\xB5\xCF\xCE\x91";
-
-    static unsigned char q[] =
-"\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9"
-"\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5F";
-    
-    static unsigned char dmp1[] =
-"\x00\x8A\x15\x78\xAC\x5D\x13\xAF\x10\x2B\x22\xB9\x99\xCD\x74\x61"
-"\xF1\x5E\x6D\x22\xCC\x03\x23\xDF\xDF\x0B";
-
-    static unsigned char dmq1[] =
-"\x00\x86\x55\x21\x4A\xC5\x4D\x8D\x4E\xCD\x61\x77\xF1\xC7\x36\x90"
-"\xCE\x2A\x48\x2C\x8B\x05\x99\xCB\xE0\x3F";
-
-    static unsigned char iqmp[] =
-"\x00\x83\xEF\xEF\xB8\xA9\xA4\x0D\x1D\xB6\xED\x98\xAD\x84\xED\x13"
-"\x35\xDC\xC1\x08\xF3\x22\xD0\x57\xCF\x8D";
-
-    static unsigned char ctext_ex[] =
-"\x14\xbd\xdd\x28\xc9\x83\x35\x19\x23\x80\xe8\xe5\x49\xb1\x58\x2a"
-"\x8b\x40\xb4\x48\x6d\x03\xa6\xa5\x31\x1f\x1f\xd5\xf0\xa1\x80\xe4"
-"\x17\x53\x03\x29\xa9\x34\x90\x74\xb1\x52\x13\x54\x29\x08\x24\x52"
-"\x62\x51";
-
-    SetKey;
-    }
-
-static int key3(RSA *key, unsigned char *c)
-    {
-    static unsigned char n[] =
-"\x00\xBB\xF8\x2F\x09\x06\x82\xCE\x9C\x23\x38\xAC\x2B\x9D\xA8\x71"
-"\xF7\x36\x8D\x07\xEE\xD4\x10\x43\xA4\x40\xD6\xB6\xF0\x74\x54\xF5"
-"\x1F\xB8\xDF\xBA\xAF\x03\x5C\x02\xAB\x61\xEA\x48\xCE\xEB\x6F\xCD"
-"\x48\x76\xED\x52\x0D\x60\xE1\xEC\x46\x19\x71\x9D\x8A\x5B\x8B\x80"
-"\x7F\xAF\xB8\xE0\xA3\xDF\xC7\x37\x72\x3E\xE6\xB4\xB7\xD9\x3A\x25"
-"\x84\xEE\x6A\x64\x9D\x06\x09\x53\x74\x88\x34\xB2\x45\x45\x98\x39"
-"\x4E\xE0\xAA\xB1\x2D\x7B\x61\xA5\x1F\x52\x7A\x9A\x41\xF6\xC1\x68"
-"\x7F\xE2\x53\x72\x98\xCA\x2A\x8F\x59\x46\xF8\xE5\xFD\x09\x1D\xBD"
-"\xCB";
-
-    static unsigned char e[] = "\x11";
-
-    static unsigned char d[] =
-"\x00\xA5\xDA\xFC\x53\x41\xFA\xF2\x89\xC4\xB9\x88\xDB\x30\xC1\xCD"
-"\xF8\x3F\x31\x25\x1E\x06\x68\xB4\x27\x84\x81\x38\x01\x57\x96\x41"
-"\xB2\x94\x10\xB3\xC7\x99\x8D\x6B\xC4\x65\x74\x5E\x5C\x39\x26\x69"
-"\xD6\x87\x0D\xA2\xC0\x82\xA9\x39\xE3\x7F\xDC\xB8\x2E\xC9\x3E\xDA"
-"\xC9\x7F\xF3\xAD\x59\x50\xAC\xCF\xBC\x11\x1C\x76\xF1\xA9\x52\x94"
-"\x44\xE5\x6A\xAF\x68\xC5\x6C\x09\x2C\xD3\x8D\xC3\xBE\xF5\xD2\x0A"
-"\x93\x99\x26\xED\x4F\x74\xA1\x3E\xDD\xFB\xE1\xA1\xCE\xCC\x48\x94"
-"\xAF\x94\x28\xC2\xB7\xB8\x88\x3F\xE4\x46\x3A\x4B\xC8\x5B\x1C\xB3"
-"\xC1";
-
-    static unsigned char p[] =
-"\x00\xEE\xCF\xAE\x81\xB1\xB9\xB3\xC9\x08\x81\x0B\x10\xA1\xB5\x60"
-"\x01\x99\xEB\x9F\x44\xAE\xF4\xFD\xA4\x93\xB8\x1A\x9E\x3D\x84\xF6"
-"\x32\x12\x4E\xF0\x23\x6E\x5D\x1E\x3B\x7E\x28\xFA\xE7\xAA\x04\x0A"
-"\x2D\x5B\x25\x21\x76\x45\x9D\x1F\x39\x75\x41\xBA\x2A\x58\xFB\x65"
-"\x99";
-
-    static unsigned char q[] =
-"\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9"
-"\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5A\x0F\x20\x35\x02\x8B\x9D"
-"\x86\x98\x40\xB4\x16\x66\xB4\x2E\x92\xEA\x0D\xA3\xB4\x32\x04\xB5"
-"\xCF\xCE\x33\x52\x52\x4D\x04\x16\xA5\xA4\x41\xE7\x00\xAF\x46\x15"
-"\x03";
-
-    static unsigned char dmp1[] =
-"\x54\x49\x4C\xA6\x3E\xBA\x03\x37\xE4\xE2\x40\x23\xFC\xD6\x9A\x5A"
-"\xEB\x07\xDD\xDC\x01\x83\xA4\xD0\xAC\x9B\x54\xB0\x51\xF2\xB1\x3E"
-"\xD9\x49\x09\x75\xEA\xB7\x74\x14\xFF\x59\xC1\xF7\x69\x2E\x9A\x2E"
-"\x20\x2B\x38\xFC\x91\x0A\x47\x41\x74\xAD\xC9\x3C\x1F\x67\xC9\x81";
-
-    static unsigned char dmq1[] =
-"\x47\x1E\x02\x90\xFF\x0A\xF0\x75\x03\x51\xB7\xF8\x78\x86\x4C\xA9"
-"\x61\xAD\xBD\x3A\x8A\x7E\x99\x1C\x5C\x05\x56\xA9\x4C\x31\x46\xA7"
-"\xF9\x80\x3F\x8F\x6F\x8A\xE3\x42\xE9\x31\xFD\x8A\xE4\x7A\x22\x0D"
-"\x1B\x99\xA4\x95\x84\x98\x07\xFE\x39\xF9\x24\x5A\x98\x36\xDA\x3D";
-    
-    static unsigned char iqmp[] =
-"\x00\xB0\x6C\x4F\xDA\xBB\x63\x01\x19\x8D\x26\x5B\xDB\xAE\x94\x23"
-"\xB3\x80\xF2\x71\xF7\x34\x53\x88\x50\x93\x07\x7F\xCD\x39\xE2\x11"
-"\x9F\xC9\x86\x32\x15\x4F\x58\x83\xB1\x67\xA9\x67\xBF\x40\x2B\x4E"
-"\x9E\x2E\x0F\x96\x56\xE6\x98\xEA\x36\x66\xED\xFB\x25\x79\x80\x39"
-"\xF7";
-
-    static unsigned char ctext_ex[] =
-"\xb8\x24\x6b\x56\xa6\xed\x58\x81\xae\xb5\x85\xd9\xa2\x5b\x2a\xd7"
-"\x90\xc4\x17\xe0\x80\x68\x1b\xf1\xac\x2b\xc3\xde\xb6\x9d\x8b\xce"
-"\xf0\xc4\x36\x6f\xec\x40\x0a\xf0\x52\xa7\x2e\x9b\x0e\xff\xb5\xb3"
-"\xf2\xf1\x92\xdb\xea\xca\x03\xc1\x27\x40\x05\x71\x13\xbf\x1f\x06"
-"\x69\xac\x22\xe9\xf3\xa7\x85\x2e\x3c\x15\xd9\x13\xca\xb0\xb8\x86"
-"\x3a\x95\xc9\x92\x94\xce\x86\x74\x21\x49\x54\x61\x03\x46\xf4\xd4"
-"\x74\xb2\x6f\x7c\x48\xb4\x2e\xe6\x8e\x1f\x57\x2a\x1f\xc4\x02\x6a"
-"\xc4\x56\xb4\xf5\x9f\x7b\x62\x1e\xa1\xb9\xd8\x8f\x64\x20\x2f\xb1";
-
-    SetKey;
-    }
-
-static int pad_unknown(void)
-{
-    unsigned long l;
-    while ((l = ERR_get_error()) != 0)
-      if (ERR_GET_REASON(l) == RSA_R_UNKNOWN_PADDING_TYPE)
-       return(1);
-    return(0);
-}
-
-static const char rnd_seed[] = "string to make the random number generator think it has entropy";
-
-int main(int argc, char *argv[])
-    {
-    int err=0;
-    int v;
-    RSA *key;
-    unsigned char ptext[256];
-    unsigned char ctext[256];
-    static unsigned char ptext_ex[] = "\x54\x85\x9b\x34\x2c\x49\xea\x2a";
-    unsigned char ctext_ex[256];
-    int plen;
-    int clen = 0;
-    int num;
-    int n;
-
-    CRYPTO_malloc_debug_init();
-    CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);
-    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-
-    RAND_seed(rnd_seed, sizeof rnd_seed); /* or OAEP may fail */
-
-    plen = sizeof(ptext_ex) - 1;
-
-    for (v = 0; v < 6; v++)
-       {
-       key = RSA_new();
-       switch (v%3) {
-    case 0:
-       clen = key1(key, ctext_ex);
-       break;
-    case 1:
-       clen = key2(key, ctext_ex);
-       break;
-    case 2:
-       clen = key3(key, ctext_ex);
-       break;
-       }
-       if (v/3 >= 1) key->flags |= RSA_FLAG_NO_CONSTTIME;
-
-       num = RSA_public_encrypt(plen, ptext_ex, ctext, key,
-                                RSA_PKCS1_PADDING);
-       if (num != clen)
-           {
-           printf("PKCS#1 v1.5 encryption failed!\n");
-           err=1;
-           goto oaep;
-           }
-  
-       num = RSA_private_decrypt(num, ctext, ptext, key,
-                                 RSA_PKCS1_PADDING);
-       if (num != plen || memcmp(ptext, ptext_ex, num) != 0)
-           {
-           printf("PKCS#1 v1.5 decryption failed!\n");
-           err=1;
-           }
-       else
-           printf("PKCS #1 v1.5 encryption/decryption ok\n");
-
-    oaep:
-       ERR_clear_error();
-       num = RSA_public_encrypt(plen, ptext_ex, ctext, key,
-                                RSA_PKCS1_OAEP_PADDING);
-       if (num == -1 && pad_unknown())
-           {
-           printf("No OAEP support\n");
-           goto next;
-           }
-       if (num != clen)
-           {
-           printf("OAEP encryption failed!\n");
-           err=1;
-           goto next;
-           }
-
-       num = RSA_private_decrypt(num, ctext, ptext, key,
-                                 RSA_PKCS1_OAEP_PADDING);
-       if (num != plen || memcmp(ptext, ptext_ex, num) != 0)
-           {
-           printf("OAEP decryption (encrypted data) failed!\n");
-           err=1;
-           }
-       else if (memcmp(ctext, ctext_ex, num) == 0)
-           printf("OAEP test vector %d passed!\n", v);
-    
-       /* Different ciphertexts (rsa_oaep.c without -DPKCS_TESTVECT).
-          Try decrypting ctext_ex */
-
-       num = RSA_private_decrypt(clen, ctext_ex, ptext, key,
-                                 RSA_PKCS1_OAEP_PADDING);
-
-       if (num != plen || memcmp(ptext, ptext_ex, num) != 0)
-           {
-           printf("OAEP decryption (test vector data) failed!\n");
-           err=1;
-           }
-       else
-           printf("OAEP encryption/decryption ok\n");
-
-       /* Try decrypting corrupted ciphertexts */
-       for(n = 0 ; n < clen ; ++n)
-           {
-           int b;
-           unsigned char saved = ctext[n];
-           for(b = 0 ; b < 256 ; ++b)
-               {
-               if(b == saved)
-                   continue;
-               ctext[n] = b;
-               num = RSA_private_decrypt(num, ctext, ptext, key,
-                                         RSA_PKCS1_OAEP_PADDING);
-               if(num > 0)
-                   {
-                   printf("Corrupt data decrypted!\n");
-                   err = 1;
-                   }
-               }
-           }
-    next:
-       RSA_free(key);
-       }
-
-    CRYPTO_cleanup_all_ex_data();
-    ERR_remove_thread_state(NULL);
-
-    CRYPTO_mem_leaks_fp(stderr);
-
-#ifdef OPENSSL_SYS_NETWARE
-    if (err) printf("ERROR: %d\n", err);
-#endif
-    return err;
-    }
-#endif
diff --git a/lib/libcrypto/srp/srptest.c b/lib/libcrypto/srp/srptest.c
deleted file mode 100644 (file)
index 04b66b4..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-#include <openssl/opensslconf.h>
-#ifdef OPENSSL_NO_SRP
-
-#include <stdio.h>
-
-int main(int argc, char *argv[])
-       {
-       printf("No SRP support\n");
-       return(0);
-       }
-
-#else
-
-#include <openssl/srp.h>
-#include <openssl/rand.h>
-#include <openssl/err.h>
-
-static void showbn(const char *name, const BIGNUM *bn)
-       {
-       fputs(name, stdout);
-       fputs(" = ", stdout);
-       BN_print_fp(stdout, bn);
-       putc('\n', stdout);
-       }
-
-#define RANDOM_SIZE 32 /* use 256 bits on each side */
-
-static int run_srp(const char *username, const char *client_pass, const char *server_pass)
-       {
-       int ret=-1;
-       BIGNUM *s = NULL;
-       BIGNUM *v = NULL;
-       BIGNUM *a = NULL;
-       BIGNUM *b = NULL;
-       BIGNUM *u = NULL;
-       BIGNUM *x = NULL;
-       BIGNUM *Apub = NULL;
-       BIGNUM *Bpub = NULL;
-       BIGNUM *Kclient = NULL;
-       BIGNUM *Kserver = NULL;
-       unsigned char rand_tmp[RANDOM_SIZE];
-       /* use builtin 1024-bit params */
-       SRP_gN *GN = SRP_get_default_gN("1024");
-
-       if(GN == NULL)
-               {
-               fprintf(stderr, "Failed to get SRP parameters\n");
-               return -1;
-               }
-       /* Set up server's password entry */
-       if(!SRP_create_verifier_BN(username, server_pass, &s, &v, GN->N, GN->g))
-               {
-               fprintf(stderr, "Failed to create SRP verifier\n");
-               return -1;
-               }
-
-       showbn("N", GN->N);
-       showbn("g", GN->g);
-       showbn("Salt", s);
-       showbn("Verifier", v);
-
-       /* Server random */
-       RAND_pseudo_bytes(rand_tmp, sizeof(rand_tmp));
-       b = BN_bin2bn(rand_tmp, sizeof(rand_tmp), NULL);
-       /* TODO - check b != 0 */
-       showbn("b", b);
-
-       /* Server's first message */
-       Bpub = SRP_Calc_B(b, GN->N, GN->g, v);
-       showbn("B", Bpub);
-
-       if(!SRP_Verify_B_mod_N(Bpub, GN->N))
-               {
-               fprintf(stderr, "Invalid B\n");
-               return -1;
-               }
-
-       /* Client random */
-       RAND_pseudo_bytes(rand_tmp, sizeof(rand_tmp));
-       a = BN_bin2bn(rand_tmp, sizeof(rand_tmp), NULL);
-       /* TODO - check a != 0 */
-       showbn("a", a);
-
-       /* Client's response */
-       Apub = SRP_Calc_A(a, GN->N, GN->g);
-       showbn("A", Apub);
-
-       if(!SRP_Verify_A_mod_N(Apub, GN->N))
-               {
-               fprintf(stderr, "Invalid A\n");
-               return -1;
-               }
-
-       /* Both sides calculate u */
-       u = SRP_Calc_u(Apub, Bpub, GN->N);
-
-       /* Client's key */
-       x = SRP_Calc_x(s, username, client_pass);
-       Kclient = SRP_Calc_client_key(GN->N, Bpub, GN->g, x, a, u);
-       showbn("Client's key", Kclient);
-
-       /* Server's key */
-       Kserver = SRP_Calc_server_key(Apub, v, u, b, GN->N);
-       showbn("Server's key", Kserver);
-
-       if(BN_cmp(Kclient, Kserver) == 0)
-               {
-               ret = 0;
-               }
-       else
-               {
-               fprintf(stderr, "Keys mismatch\n");
-               ret = 1;
-               }
-
-       BN_clear_free(Kclient);
-       BN_clear_free(Kserver);
-       BN_clear_free(x);
-       BN_free(u);
-       BN_free(Apub);
-       BN_clear_free(a);
-       BN_free(Bpub);
-       BN_clear_free(b);
-       BN_free(s);
-       BN_clear_free(v);
-
-       return ret;
-       }
-
-int main(int argc, char **argv)
-       {
-       BIO *bio_err;
-       bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
-
-       CRYPTO_malloc_debug_init();
-       CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);
-       CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-
-       ERR_load_crypto_strings();
-
-       /* "Negative" test, expect a mismatch */
-       if(run_srp("alice", "password1", "password2") == 0)
-               {
-               fprintf(stderr, "Mismatched SRP run failed\n");
-               return 1;
-               }
-
-       /* "Positive" test, should pass */
-       if(run_srp("alice", "password", "password") != 0)
-               {
-               fprintf(stderr, "Plain SRP run failed\n");
-               return 1;
-               }
-
-       CRYPTO_cleanup_all_ex_data();
-       ERR_remove_thread_state(NULL);
-       ERR_free_strings();
-       CRYPTO_mem_leaks(bio_err);
-
-       return 0;
-       }
-#endif
diff --git a/lib/libcrypto/whrlpool/wp_test.c b/lib/libcrypto/whrlpool/wp_test.c
deleted file mode 100644 (file)
index c68c2c6..0000000
+++ /dev/null
@@ -1,228 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2005 The OpenSSL Project.  All rights reserved.
- * ====================================================================
- */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <openssl/whrlpool.h>
-#include <openssl/crypto.h>
-
-#if defined(OPENSSL_NO_WHIRLPOOL)
-int main(int argc, char *argv[])
-{
-    printf("No Whirlpool support\n");
-    return(0);
-}
-#else
-
-/* ISO/IEC 10118-3 test vector set */
-unsigned char iso_test_1[WHIRLPOOL_DIGEST_LENGTH] = {
-       0x19,0xFA,0x61,0xD7,0x55,0x22,0xA4,0x66,
-       0x9B,0x44,0xE3,0x9C,0x1D,0x2E,0x17,0x26,
-       0xC5,0x30,0x23,0x21,0x30,0xD4,0x07,0xF8,
-       0x9A,0xFE,0xE0,0x96,0x49,0x97,0xF7,0xA7,
-       0x3E,0x83,0xBE,0x69,0x8B,0x28,0x8F,0xEB,
-       0xCF,0x88,0xE3,0xE0,0x3C,0x4F,0x07,0x57,
-       0xEA,0x89,0x64,0xE5,0x9B,0x63,0xD9,0x37,
-       0x08,0xB1,0x38,0xCC,0x42,0xA6,0x6E,0xB3 };
-
-unsigned char iso_test_2[WHIRLPOOL_DIGEST_LENGTH] = {
-       0x8A,0xCA,0x26,0x02,0x79,0x2A,0xEC,0x6F,
-       0x11,0xA6,0x72,0x06,0x53,0x1F,0xB7,0xD7,
-       0xF0,0xDF,0xF5,0x94,0x13,0x14,0x5E,0x69,
-       0x73,0xC4,0x50,0x01,0xD0,0x08,0x7B,0x42,
-       0xD1,0x1B,0xC6,0x45,0x41,0x3A,0xEF,0xF6,
-       0x3A,0x42,0x39,0x1A,0x39,0x14,0x5A,0x59,
-       0x1A,0x92,0x20,0x0D,0x56,0x01,0x95,0xE5,
-       0x3B,0x47,0x85,0x84,0xFD,0xAE,0x23,0x1A };
-
-unsigned char iso_test_3[WHIRLPOOL_DIGEST_LENGTH] = {
-       0x4E,0x24,0x48,0xA4,0xC6,0xF4,0x86,0xBB,
-       0x16,0xB6,0x56,0x2C,0x73,0xB4,0x02,0x0B,
-       0xF3,0x04,0x3E,0x3A,0x73,0x1B,0xCE,0x72,
-       0x1A,0xE1,0xB3,0x03,0xD9,0x7E,0x6D,0x4C,
-       0x71,0x81,0xEE,0xBD,0xB6,0xC5,0x7E,0x27,
-       0x7D,0x0E,0x34,0x95,0x71,0x14,0xCB,0xD6,
-       0xC7,0x97,0xFC,0x9D,0x95,0xD8,0xB5,0x82,
-       0xD2,0x25,0x29,0x20,0x76,0xD4,0xEE,0xF5 };
-
-unsigned char iso_test_4[WHIRLPOOL_DIGEST_LENGTH] = {
-       0x37,0x8C,0x84,0xA4,0x12,0x6E,0x2D,0xC6,
-       0xE5,0x6D,0xCC,0x74,0x58,0x37,0x7A,0xAC,
-       0x83,0x8D,0x00,0x03,0x22,0x30,0xF5,0x3C,
-       0xE1,0xF5,0x70,0x0C,0x0F,0xFB,0x4D,0x3B,
-       0x84,0x21,0x55,0x76,0x59,0xEF,0x55,0xC1,
-       0x06,0xB4,0xB5,0x2A,0xC5,0xA4,0xAA,0xA6,
-       0x92,0xED,0x92,0x00,0x52,0x83,0x8F,0x33,
-       0x62,0xE8,0x6D,0xBD,0x37,0xA8,0x90,0x3E };
-
-unsigned char iso_test_5[WHIRLPOOL_DIGEST_LENGTH] = {
-       0xF1,0xD7,0x54,0x66,0x26,0x36,0xFF,0xE9,
-       0x2C,0x82,0xEB,0xB9,0x21,0x2A,0x48,0x4A,
-       0x8D,0x38,0x63,0x1E,0xAD,0x42,0x38,0xF5,
-       0x44,0x2E,0xE1,0x3B,0x80,0x54,0xE4,0x1B,
-       0x08,0xBF,0x2A,0x92,0x51,0xC3,0x0B,0x6A,
-       0x0B,0x8A,0xAE,0x86,0x17,0x7A,0xB4,0xA6,
-       0xF6,0x8F,0x67,0x3E,0x72,0x07,0x86,0x5D,
-       0x5D,0x98,0x19,0xA3,0xDB,0xA4,0xEB,0x3B };
-
-unsigned char iso_test_6[WHIRLPOOL_DIGEST_LENGTH] = {
-       0xDC,0x37,0xE0,0x08,0xCF,0x9E,0xE6,0x9B,
-       0xF1,0x1F,0x00,0xED,0x9A,0xBA,0x26,0x90,
-       0x1D,0xD7,0xC2,0x8C,0xDE,0xC0,0x66,0xCC,
-       0x6A,0xF4,0x2E,0x40,0xF8,0x2F,0x3A,0x1E,
-       0x08,0xEB,0xA2,0x66,0x29,0x12,0x9D,0x8F,
-       0xB7,0xCB,0x57,0x21,0x1B,0x92,0x81,0xA6,
-       0x55,0x17,0xCC,0x87,0x9D,0x7B,0x96,0x21,
-       0x42,0xC6,0x5F,0x5A,0x7A,0xF0,0x14,0x67 };
-
-unsigned char iso_test_7[WHIRLPOOL_DIGEST_LENGTH] = {
-       0x46,0x6E,0xF1,0x8B,0xAB,0xB0,0x15,0x4D,
-       0x25,0xB9,0xD3,0x8A,0x64,0x14,0xF5,0xC0,
-       0x87,0x84,0x37,0x2B,0xCC,0xB2,0x04,0xD6,
-       0x54,0x9C,0x4A,0xFA,0xDB,0x60,0x14,0x29,
-       0x4D,0x5B,0xD8,0xDF,0x2A,0x6C,0x44,0xE5,
-       0x38,0xCD,0x04,0x7B,0x26,0x81,0xA5,0x1A,
-       0x2C,0x60,0x48,0x1E,0x88,0xC5,0xA2,0x0B,
-       0x2C,0x2A,0x80,0xCF,0x3A,0x9A,0x08,0x3B };
-
-unsigned char iso_test_8[WHIRLPOOL_DIGEST_LENGTH] = {
-       0x2A,0x98,0x7E,0xA4,0x0F,0x91,0x70,0x61,
-       0xF5,0xD6,0xF0,0xA0,0xE4,0x64,0x4F,0x48,
-       0x8A,0x7A,0x5A,0x52,0xDE,0xEE,0x65,0x62,
-       0x07,0xC5,0x62,0xF9,0x88,0xE9,0x5C,0x69,
-       0x16,0xBD,0xC8,0x03,0x1B,0xC5,0xBE,0x1B,
-       0x7B,0x94,0x76,0x39,0xFE,0x05,0x0B,0x56,
-       0x93,0x9B,0xAA,0xA0,0xAD,0xFF,0x9A,0xE6,
-       0x74,0x5B,0x7B,0x18,0x1C,0x3B,0xE3,0xFD };
-
-unsigned char iso_test_9[WHIRLPOOL_DIGEST_LENGTH] = {
-       0x0C,0x99,0x00,0x5B,0xEB,0x57,0xEF,0xF5,
-       0x0A,0x7C,0xF0,0x05,0x56,0x0D,0xDF,0x5D,
-       0x29,0x05,0x7F,0xD8,0x6B,0x20,0xBF,0xD6,
-       0x2D,0xEC,0xA0,0xF1,0xCC,0xEA,0x4A,0xF5,
-       0x1F,0xC1,0x54,0x90,0xED,0xDC,0x47,0xAF,
-       0x32,0xBB,0x2B,0x66,0xC3,0x4F,0xF9,0xAD,
-       0x8C,0x60,0x08,0xAD,0x67,0x7F,0x77,0x12,
-       0x69,0x53,0xB2,0x26,0xE4,0xED,0x8B,0x01 };
-
-int main (int argc,char *argv[])
-{ unsigned char md[WHIRLPOOL_DIGEST_LENGTH];
-  int          i;
-  WHIRLPOOL_CTX        ctx;
-
-#ifdef OPENSSL_IA32_SSE2
-    /* Alternative to this is to call OpenSSL_add_all_algorithms...
-     * The below code is retained exclusively for debugging purposes. */
-    { char      *env;
-
-       if ((env=getenv("OPENSSL_ia32cap")))
-           OPENSSL_ia32cap = strtoul (env,NULL,0);
-    }
-#endif
-
-    fprintf(stdout,"Testing Whirlpool ");
-
-    WHIRLPOOL("",0,md);
-    if (memcmp(md,iso_test_1,sizeof(iso_test_1)))
-    {   fflush(stdout);
-       fprintf(stderr,"\nTEST 1 of 9 failed.\n");
-       return 1;
-    }
-    else
-       fprintf(stdout,"."); fflush(stdout);
-
-    WHIRLPOOL("a",1,md);
-    if (memcmp(md,iso_test_2,sizeof(iso_test_2)))
-    {   fflush(stdout);
-       fprintf(stderr,"\nTEST 2 of 9 failed.\n");
-       return 1;
-    }
-    else
-       fprintf(stdout,"."); fflush(stdout);
-
-    WHIRLPOOL("abc",3,md);
-    if (memcmp(md,iso_test_3,sizeof(iso_test_3)))
-    {   fflush(stdout);
-       fprintf(stderr,"\nTEST 3 of 9 failed.\n");
-       return 1;
-    }
-    else
-       fprintf(stdout,"."); fflush(stdout);
-
-    WHIRLPOOL("message digest",14,md);
-    if (memcmp(md,iso_test_4,sizeof(iso_test_4)))
-    {   fflush(stdout);
-       fprintf(stderr,"\nTEST 4 of 9 failed.\n");
-       return 1;
-    }
-    else
-       fprintf(stdout,"."); fflush(stdout);
-
-    WHIRLPOOL("abcdefghijklmnopqrstuvwxyz",26,md);
-    if (memcmp(md,iso_test_5,sizeof(iso_test_5)))
-    {   fflush(stdout);
-       fprintf(stderr,"\nTEST 5 of 9 failed.\n");
-       return 1;
-    }
-    else
-       fprintf(stdout,"."); fflush(stdout);
-
-    WHIRLPOOL( "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-               "abcdefghijklmnopqrstuvwxyz"
-               "0123456789",62,md);
-    if (memcmp(md,iso_test_6,sizeof(iso_test_6)))
-    {   fflush(stdout);
-       fprintf(stderr,"\nTEST 6 of 9 failed.\n");
-       return 1;
-    }
-    else
-       fprintf(stdout,"."); fflush(stdout);
-
-    WHIRLPOOL( "1234567890""1234567890""1234567890""1234567890"
-               "1234567890""1234567890""1234567890""1234567890",80,md);
-    if (memcmp(md,iso_test_7,sizeof(iso_test_7)))
-    {   fflush(stdout);
-       fprintf(stderr,"\nTEST 7 of 9 failed.\n");
-       return 1;
-    }
-    else
-       fprintf(stdout,"."); fflush(stdout);
-
-    WHIRLPOOL("abcdbcdecdefdefgefghfghighijhijk",32,md);
-    if (memcmp(md,iso_test_8,sizeof(iso_test_8)))
-    {   fflush(stdout);
-       fprintf(stderr,"\nTEST 8 of 9 failed.\n");
-       return 1;
-    }
-    else
-       fprintf(stdout,"."); fflush(stdout);
-    WHIRLPOOL_Init (&ctx);
-    for (i=0;i<1000000;i+=288)
-       WHIRLPOOL_Update (&ctx, "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                               "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                               "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                               "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                               "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                               "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                               "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                               "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                               "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa",
-                               (1000000-i)<288?1000000-i:288);
-    WHIRLPOOL_Final (md,&ctx);
-    if (memcmp(md,iso_test_9,sizeof(iso_test_9)))
-    {   fflush(stdout);
-       fprintf(stderr,"\nTEST 9 of 9 failed.\n");
-       return 1;
-    }
-    else
-       fprintf(stdout,"."); fflush(stdout);
-
-    fprintf(stdout," passed.\n"); fflush(stdout);
-
-  return 0;
-}
-#endif
diff --git a/lib/libssl/src/crypto/bn/divtest.c b/lib/libssl/src/crypto/bn/divtest.c
deleted file mode 100644 (file)
index d3fc688..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <openssl/bn.h>
-#include <openssl/rand.h>
-
-static int Rand(n)
-{
-    unsigned char x[2];
-    RAND_pseudo_bytes(x,2);
-    return (x[0] + 2*x[1]);
-}
-
-static void bug(char *m, BIGNUM *a, BIGNUM *b)
-{
-    printf("%s!\na=",m);
-    BN_print_fp(stdout, a);
-    printf("\nb=");
-    BN_print_fp(stdout, b);
-    printf("\n");
-    fflush(stdout);
-}
-
-main()
-{
-    BIGNUM *a=BN_new(), *b=BN_new(), *c=BN_new(), *d=BN_new(),
-       *C=BN_new(), *D=BN_new();
-    BN_RECP_CTX *recp=BN_RECP_CTX_new();
-    BN_CTX *ctx=BN_CTX_new();
-
-    for(;;) {
-       BN_pseudo_rand(a,Rand(),0,0);
-       BN_pseudo_rand(b,Rand(),0,0);
-       if (BN_is_zero(b)) continue;
-
-       BN_RECP_CTX_set(recp,b,ctx);
-       if (BN_div(C,D,a,b,ctx) != 1)
-           bug("BN_div failed",a,b);
-       if (BN_div_recp(c,d,a,recp,ctx) != 1)
-           bug("BN_div_recp failed",a,b);
-       else if (BN_cmp(c,C) != 0 || BN_cmp(c,C) != 0)
-           bug("mismatch",a,b);
-    }
-}
diff --git a/lib/libssl/src/crypto/jpake/jpaketest.c b/lib/libssl/src/crypto/jpake/jpaketest.c
deleted file mode 100644 (file)
index eaba75e..0000000
+++ /dev/null
@@ -1,192 +0,0 @@
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_NO_JPAKE
-
-#include <stdio.h>
-
-int main(int argc, char *argv[])
-{
-    printf("No J-PAKE support\n");
-    return(0);
-}
-
-#else
-
-#include <openssl/jpake.h>
-#include <openssl/err.h>
-
-static void showbn(const char *name, const BIGNUM *bn)
-    {
-    fputs(name, stdout);
-    fputs(" = ", stdout);
-    BN_print_fp(stdout, bn);
-    putc('\n', stdout);
-    }
-
-static int run_jpake(JPAKE_CTX *alice, JPAKE_CTX *bob)
-    {
-    JPAKE_STEP1 alice_s1;
-    JPAKE_STEP1 bob_s1;
-    JPAKE_STEP2 alice_s2;
-    JPAKE_STEP2 bob_s2;
-    JPAKE_STEP3A alice_s3a;
-    JPAKE_STEP3B bob_s3b;
-
-   /* Alice -> Bob: step 1 */
-    puts("A->B s1");
-    JPAKE_STEP1_init(&alice_s1);
-    JPAKE_STEP1_generate(&alice_s1, alice);
-    if(!JPAKE_STEP1_process(bob, &alice_s1))
-       {
-       printf("Bob fails to process Alice's step 1\n");
-       ERR_print_errors_fp(stdout);
-       return 1;
-       }
-    JPAKE_STEP1_release(&alice_s1);
-
-   /* Bob -> Alice: step 1 */
-    puts("B->A s1");
-    JPAKE_STEP1_init(&bob_s1);
-    JPAKE_STEP1_generate(&bob_s1, bob);
-    if(!JPAKE_STEP1_process(alice, &bob_s1))
-       {
-       printf("Alice fails to process Bob's step 1\n");
-       ERR_print_errors_fp(stdout);
-       return 2;
-       }
-    JPAKE_STEP1_release(&bob_s1);
-
-   /* Alice -> Bob: step 2 */
-    puts("A->B s2");
-    JPAKE_STEP2_init(&alice_s2);
-    JPAKE_STEP2_generate(&alice_s2, alice);
-    if(!JPAKE_STEP2_process(bob, &alice_s2))
-       {
-       printf("Bob fails to process Alice's step 2\n");
-       ERR_print_errors_fp(stdout);
-       return 3;
-       }
-    JPAKE_STEP2_release(&alice_s2);
-
-   /* Bob -> Alice: step 2 */
-    puts("B->A s2");
-    JPAKE_STEP2_init(&bob_s2);
-    JPAKE_STEP2_generate(&bob_s2, bob);
-    if(!JPAKE_STEP2_process(alice, &bob_s2))
-       {
-       printf("Alice fails to process Bob's step 2\n");
-       ERR_print_errors_fp(stdout);
-       return 4;
-       }
-    JPAKE_STEP2_release(&bob_s2);
-
-    showbn("Alice's key", JPAKE_get_shared_key(alice));
-    showbn("Bob's key  ", JPAKE_get_shared_key(bob));
-
-   /* Alice -> Bob: step 3a */
-    puts("A->B s3a");
-    JPAKE_STEP3A_init(&alice_s3a);
-    JPAKE_STEP3A_generate(&alice_s3a, alice);
-    if(!JPAKE_STEP3A_process(bob, &alice_s3a))
-       {
-       printf("Bob fails to process Alice's step 3a\n");
-       ERR_print_errors_fp(stdout);
-       return 5;
-       }
-    JPAKE_STEP3A_release(&alice_s3a);
-    
-   /* Bob -> Alice: step 3b */
-    puts("B->A s3b");
-    JPAKE_STEP3B_init(&bob_s3b);
-    JPAKE_STEP3B_generate(&bob_s3b, bob);
-    if(!JPAKE_STEP3B_process(alice, &bob_s3b))
-       {
-       printf("Alice fails to process Bob's step 3b\n");
-       ERR_print_errors_fp(stdout);
-       return 6;
-       }
-    JPAKE_STEP3B_release(&bob_s3b);
-
-    return 0;
-    }
-
-int main(int argc, char **argv)
-    {
-    JPAKE_CTX *alice;
-    JPAKE_CTX *bob;
-    BIGNUM *p = NULL;
-    BIGNUM *g = NULL;
-    BIGNUM *q = NULL;
-    BIGNUM *secret = BN_new();
-    BIO *bio_err;
-
-    bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
-
-    CRYPTO_malloc_debug_init();
-    CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);
-    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-
-    ERR_load_crypto_strings();
-
-    /*
-    BN_hex2bn(&p, "fd7f53811d75122952df4a9c2eece4e7f611b7523cef4400c31e3f80b6512669455d402251fb593d8d58fabfc5f5ba30f6cb9b556cd7813b801d346ff26660b76b9950a5a49f9fe8047b1022c24fbba9d7feb7c61bf83b57e7c6a8a6150f04fb83f6d3c51ec3023554135a169132f675f3ae2b61d72aeff22203199dd14801c7");
-    BN_hex2bn(&g, "f7e1a085d69b3ddecbbcab5c36b857b97994afbbfa3aea82f9574c0b3d0782675159578ebad4594fe67107108180b449167123e84c281613b7cf09328cc8a6e13c167a8b547c8d28e0a3ae1e2bb3a675916ea37f0bfa213562f1fb627a01243bcca4f1bea8519089a883dfe15ae59f06928b665e807b552564014c3bfecf492a");
-    BN_hex2bn(&q, "9760508f15230bccb292b982a2eb840bf0581cf5");
-    */
-    /*
-    p = BN_new();
-    BN_generate_prime(p, 1024, 1, NULL, NULL, NULL, NULL);
-    */
-   /* Use a safe prime for p (that we found earlier) */
-    BN_hex2bn(&p, "F9E5B365665EA7A05A9C534502780FEE6F1AB5BD4F49947FD036DBD7E905269AF46EF28B0FC07487EE4F5D20FB3C0AF8E700F3A2FA3414970CBED44FEDFF80CE78D800F184BB82435D137AADA2C6C16523247930A63B85661D1FC817A51ACD96168E95898A1F83A79FFB529368AA7833ABD1B0C3AEDDB14D2E1A2F71D99F763F");
-    showbn("p", p);
-    g = BN_new();
-    BN_set_word(g, 2);
-    showbn("g", g);
-    q = BN_new();
-    BN_rshift1(q, p);
-    showbn("q", q);
-
-    BN_rand(secret, 32, -1, 0);
-
-   /* A normal run, expect this to work... */
-    alice = JPAKE_CTX_new("Alice", "Bob", p, g, q, secret);
-    bob = JPAKE_CTX_new("Bob", "Alice", p, g, q, secret);
-
-    if(run_jpake(alice, bob) != 0)
-       {
-       fprintf(stderr, "Plain JPAKE run failed\n");
-       return 1;
-       }
-
-    JPAKE_CTX_free(bob);
-    JPAKE_CTX_free(alice);
-
-   /* Now give Alice and Bob different secrets */
-    alice = JPAKE_CTX_new("Alice", "Bob", p, g, q, secret);
-    BN_add_word(secret, 1);
-    bob = JPAKE_CTX_new("Bob", "Alice", p, g, q, secret);
-
-    if(run_jpake(alice, bob) != 5)
-       {
-       fprintf(stderr, "Mismatched secret JPAKE run failed\n");
-       return 1;
-       }
-
-    JPAKE_CTX_free(bob);
-    JPAKE_CTX_free(alice);
-
-    BN_free(secret);
-    BN_free(q);
-    BN_free(g);
-    BN_free(p);
-
-    CRYPTO_cleanup_all_ex_data();
-    ERR_remove_thread_state(NULL);
-    ERR_free_strings();
-    CRYPTO_mem_leaks(bio_err);
-
-    return 0;
-    }
-
-#endif
diff --git a/lib/libssl/src/crypto/rsa/rsa_test.c b/lib/libssl/src/crypto/rsa/rsa_test.c
deleted file mode 100644 (file)
index c8705a0..0000000
+++ /dev/null
@@ -1,340 +0,0 @@
-/* test vectors from p1ovect1.txt */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "e_os.h"
-
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-#include <openssl/bn.h>
-#ifdef OPENSSL_NO_RSA
-int main(int argc, char *argv[])
-{
-    printf("No RSA support\n");
-    return(0);
-}
-#else
-#include <openssl/rsa.h>
-
-#define SetKey \
-  key->n = BN_bin2bn(n, sizeof(n)-1, key->n); \
-  key->e = BN_bin2bn(e, sizeof(e)-1, key->e); \
-  key->d = BN_bin2bn(d, sizeof(d)-1, key->d); \
-  key->p = BN_bin2bn(p, sizeof(p)-1, key->p); \
-  key->q = BN_bin2bn(q, sizeof(q)-1, key->q); \
-  key->dmp1 = BN_bin2bn(dmp1, sizeof(dmp1)-1, key->dmp1); \
-  key->dmq1 = BN_bin2bn(dmq1, sizeof(dmq1)-1, key->dmq1); \
-  key->iqmp = BN_bin2bn(iqmp, sizeof(iqmp)-1, key->iqmp); \
-  memcpy(c, ctext_ex, sizeof(ctext_ex) - 1); \
-  return (sizeof(ctext_ex) - 1);
-
-static int key1(RSA *key, unsigned char *c)
-    {
-    static unsigned char n[] =
-"\x00\xAA\x36\xAB\xCE\x88\xAC\xFD\xFF\x55\x52\x3C\x7F\xC4\x52\x3F"
-"\x90\xEF\xA0\x0D\xF3\x77\x4A\x25\x9F\x2E\x62\xB4\xC5\xD9\x9C\xB5"
-"\xAD\xB3\x00\xA0\x28\x5E\x53\x01\x93\x0E\x0C\x70\xFB\x68\x76\x93"
-"\x9C\xE6\x16\xCE\x62\x4A\x11\xE0\x08\x6D\x34\x1E\xBC\xAC\xA0\xA1"
-"\xF5";
-
-    static unsigned char e[] = "\x11";
-
-    static unsigned char d[] =
-"\x0A\x03\x37\x48\x62\x64\x87\x69\x5F\x5F\x30\xBC\x38\xB9\x8B\x44"
-"\xC2\xCD\x2D\xFF\x43\x40\x98\xCD\x20\xD8\xA1\x38\xD0\x90\xBF\x64"
-"\x79\x7C\x3F\xA7\xA2\xCD\xCB\x3C\xD1\xE0\xBD\xBA\x26\x54\xB4\xF9"
-"\xDF\x8E\x8A\xE5\x9D\x73\x3D\x9F\x33\xB3\x01\x62\x4A\xFD\x1D\x51";
-
-    static unsigned char p[] =
-"\x00\xD8\x40\xB4\x16\x66\xB4\x2E\x92\xEA\x0D\xA3\xB4\x32\x04\xB5"
-"\xCF\xCE\x33\x52\x52\x4D\x04\x16\xA5\xA4\x41\xE7\x00\xAF\x46\x12"
-"\x0D";
-    
-    static unsigned char q[] =
-"\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9"
-"\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5A\x0F\x20\x35\x02\x8B\x9D"
-"\x89";
-
-    static unsigned char dmp1[] =
-"\x59\x0B\x95\x72\xA2\xC2\xA9\xC4\x06\x05\x9D\xC2\xAB\x2F\x1D\xAF"
-"\xEB\x7E\x8B\x4F\x10\xA7\x54\x9E\x8E\xED\xF5\xB4\xFC\xE0\x9E\x05";
-
-    static unsigned char dmq1[] =
-"\x00\x8E\x3C\x05\x21\xFE\x15\xE0\xEA\x06\xA3\x6F\xF0\xF1\x0C\x99"
-"\x52\xC3\x5B\x7A\x75\x14\xFD\x32\x38\xB8\x0A\xAD\x52\x98\x62\x8D"
-"\x51";
-
-    static unsigned char iqmp[] =
-"\x36\x3F\xF7\x18\x9D\xA8\xE9\x0B\x1D\x34\x1F\x71\xD0\x9B\x76\xA8"
-"\xA9\x43\xE1\x1D\x10\xB2\x4D\x24\x9F\x2D\xEA\xFE\xF8\x0C\x18\x26";
-
-    static unsigned char ctext_ex[] =
-"\x1b\x8f\x05\xf9\xca\x1a\x79\x52\x6e\x53\xf3\xcc\x51\x4f\xdb\x89"
-"\x2b\xfb\x91\x93\x23\x1e\x78\xb9\x92\xe6\x8d\x50\xa4\x80\xcb\x52"
-"\x33\x89\x5c\x74\x95\x8d\x5d\x02\xab\x8c\x0f\xd0\x40\xeb\x58\x44"
-"\xb0\x05\xc3\x9e\xd8\x27\x4a\x9d\xbf\xa8\x06\x71\x40\x94\x39\xd2";
-
-    SetKey;
-    }
-
-static int key2(RSA *key, unsigned char *c)
-    {
-    static unsigned char n[] =
-"\x00\xA3\x07\x9A\x90\xDF\x0D\xFD\x72\xAC\x09\x0C\xCC\x2A\x78\xB8"
-"\x74\x13\x13\x3E\x40\x75\x9C\x98\xFA\xF8\x20\x4F\x35\x8A\x0B\x26"
-"\x3C\x67\x70\xE7\x83\xA9\x3B\x69\x71\xB7\x37\x79\xD2\x71\x7B\xE8"
-"\x34\x77\xCF";
-
-    static unsigned char e[] = "\x3";
-
-    static unsigned char d[] =
-"\x6C\xAF\xBC\x60\x94\xB3\xFE\x4C\x72\xB0\xB3\x32\xC6\xFB\x25\xA2"
-"\xB7\x62\x29\x80\x4E\x68\x65\xFC\xA4\x5A\x74\xDF\x0F\x8F\xB8\x41"
-"\x3B\x52\xC0\xD0\xE5\x3D\x9B\x59\x0F\xF1\x9B\xE7\x9F\x49\xDD\x21"
-"\xE5\xEB";
-
-    static unsigned char p[] =
-"\x00\xCF\x20\x35\x02\x8B\x9D\x86\x98\x40\xB4\x16\x66\xB4\x2E\x92"
-"\xEA\x0D\xA3\xB4\x32\x04\xB5\xCF\xCE\x91";
-
-    static unsigned char q[] =
-"\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9"
-"\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5F";
-    
-    static unsigned char dmp1[] =
-"\x00\x8A\x15\x78\xAC\x5D\x13\xAF\x10\x2B\x22\xB9\x99\xCD\x74\x61"
-"\xF1\x5E\x6D\x22\xCC\x03\x23\xDF\xDF\x0B";
-
-    static unsigned char dmq1[] =
-"\x00\x86\x55\x21\x4A\xC5\x4D\x8D\x4E\xCD\x61\x77\xF1\xC7\x36\x90"
-"\xCE\x2A\x48\x2C\x8B\x05\x99\xCB\xE0\x3F";
-
-    static unsigned char iqmp[] =
-"\x00\x83\xEF\xEF\xB8\xA9\xA4\x0D\x1D\xB6\xED\x98\xAD\x84\xED\x13"
-"\x35\xDC\xC1\x08\xF3\x22\xD0\x57\xCF\x8D";
-
-    static unsigned char ctext_ex[] =
-"\x14\xbd\xdd\x28\xc9\x83\x35\x19\x23\x80\xe8\xe5\x49\xb1\x58\x2a"
-"\x8b\x40\xb4\x48\x6d\x03\xa6\xa5\x31\x1f\x1f\xd5\xf0\xa1\x80\xe4"
-"\x17\x53\x03\x29\xa9\x34\x90\x74\xb1\x52\x13\x54\x29\x08\x24\x52"
-"\x62\x51";
-
-    SetKey;
-    }
-
-static int key3(RSA *key, unsigned char *c)
-    {
-    static unsigned char n[] =
-"\x00\xBB\xF8\x2F\x09\x06\x82\xCE\x9C\x23\x38\xAC\x2B\x9D\xA8\x71"
-"\xF7\x36\x8D\x07\xEE\xD4\x10\x43\xA4\x40\xD6\xB6\xF0\x74\x54\xF5"
-"\x1F\xB8\xDF\xBA\xAF\x03\x5C\x02\xAB\x61\xEA\x48\xCE\xEB\x6F\xCD"
-"\x48\x76\xED\x52\x0D\x60\xE1\xEC\x46\x19\x71\x9D\x8A\x5B\x8B\x80"
-"\x7F\xAF\xB8\xE0\xA3\xDF\xC7\x37\x72\x3E\xE6\xB4\xB7\xD9\x3A\x25"
-"\x84\xEE\x6A\x64\x9D\x06\x09\x53\x74\x88\x34\xB2\x45\x45\x98\x39"
-"\x4E\xE0\xAA\xB1\x2D\x7B\x61\xA5\x1F\x52\x7A\x9A\x41\xF6\xC1\x68"
-"\x7F\xE2\x53\x72\x98\xCA\x2A\x8F\x59\x46\xF8\xE5\xFD\x09\x1D\xBD"
-"\xCB";
-
-    static unsigned char e[] = "\x11";
-
-    static unsigned char d[] =
-"\x00\xA5\xDA\xFC\x53\x41\xFA\xF2\x89\xC4\xB9\x88\xDB\x30\xC1\xCD"
-"\xF8\x3F\x31\x25\x1E\x06\x68\xB4\x27\x84\x81\x38\x01\x57\x96\x41"
-"\xB2\x94\x10\xB3\xC7\x99\x8D\x6B\xC4\x65\x74\x5E\x5C\x39\x26\x69"
-"\xD6\x87\x0D\xA2\xC0\x82\xA9\x39\xE3\x7F\xDC\xB8\x2E\xC9\x3E\xDA"
-"\xC9\x7F\xF3\xAD\x59\x50\xAC\xCF\xBC\x11\x1C\x76\xF1\xA9\x52\x94"
-"\x44\xE5\x6A\xAF\x68\xC5\x6C\x09\x2C\xD3\x8D\xC3\xBE\xF5\xD2\x0A"
-"\x93\x99\x26\xED\x4F\x74\xA1\x3E\xDD\xFB\xE1\xA1\xCE\xCC\x48\x94"
-"\xAF\x94\x28\xC2\xB7\xB8\x88\x3F\xE4\x46\x3A\x4B\xC8\x5B\x1C\xB3"
-"\xC1";
-
-    static unsigned char p[] =
-"\x00\xEE\xCF\xAE\x81\xB1\xB9\xB3\xC9\x08\x81\x0B\x10\xA1\xB5\x60"
-"\x01\x99\xEB\x9F\x44\xAE\xF4\xFD\xA4\x93\xB8\x1A\x9E\x3D\x84\xF6"
-"\x32\x12\x4E\xF0\x23\x6E\x5D\x1E\x3B\x7E\x28\xFA\xE7\xAA\x04\x0A"
-"\x2D\x5B\x25\x21\x76\x45\x9D\x1F\x39\x75\x41\xBA\x2A\x58\xFB\x65"
-"\x99";
-
-    static unsigned char q[] =
-"\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9"
-"\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5A\x0F\x20\x35\x02\x8B\x9D"
-"\x86\x98\x40\xB4\x16\x66\xB4\x2E\x92\xEA\x0D\xA3\xB4\x32\x04\xB5"
-"\xCF\xCE\x33\x52\x52\x4D\x04\x16\xA5\xA4\x41\xE7\x00\xAF\x46\x15"
-"\x03";
-
-    static unsigned char dmp1[] =
-"\x54\x49\x4C\xA6\x3E\xBA\x03\x37\xE4\xE2\x40\x23\xFC\xD6\x9A\x5A"
-"\xEB\x07\xDD\xDC\x01\x83\xA4\xD0\xAC\x9B\x54\xB0\x51\xF2\xB1\x3E"
-"\xD9\x49\x09\x75\xEA\xB7\x74\x14\xFF\x59\xC1\xF7\x69\x2E\x9A\x2E"
-"\x20\x2B\x38\xFC\x91\x0A\x47\x41\x74\xAD\xC9\x3C\x1F\x67\xC9\x81";
-
-    static unsigned char dmq1[] =
-"\x47\x1E\x02\x90\xFF\x0A\xF0\x75\x03\x51\xB7\xF8\x78\x86\x4C\xA9"
-"\x61\xAD\xBD\x3A\x8A\x7E\x99\x1C\x5C\x05\x56\xA9\x4C\x31\x46\xA7"
-"\xF9\x80\x3F\x8F\x6F\x8A\xE3\x42\xE9\x31\xFD\x8A\xE4\x7A\x22\x0D"
-"\x1B\x99\xA4\x95\x84\x98\x07\xFE\x39\xF9\x24\x5A\x98\x36\xDA\x3D";
-    
-    static unsigned char iqmp[] =
-"\x00\xB0\x6C\x4F\xDA\xBB\x63\x01\x19\x8D\x26\x5B\xDB\xAE\x94\x23"
-"\xB3\x80\xF2\x71\xF7\x34\x53\x88\x50\x93\x07\x7F\xCD\x39\xE2\x11"
-"\x9F\xC9\x86\x32\x15\x4F\x58\x83\xB1\x67\xA9\x67\xBF\x40\x2B\x4E"
-"\x9E\x2E\x0F\x96\x56\xE6\x98\xEA\x36\x66\xED\xFB\x25\x79\x80\x39"
-"\xF7";
-
-    static unsigned char ctext_ex[] =
-"\xb8\x24\x6b\x56\xa6\xed\x58\x81\xae\xb5\x85\xd9\xa2\x5b\x2a\xd7"
-"\x90\xc4\x17\xe0\x80\x68\x1b\xf1\xac\x2b\xc3\xde\xb6\x9d\x8b\xce"
-"\xf0\xc4\x36\x6f\xec\x40\x0a\xf0\x52\xa7\x2e\x9b\x0e\xff\xb5\xb3"
-"\xf2\xf1\x92\xdb\xea\xca\x03\xc1\x27\x40\x05\x71\x13\xbf\x1f\x06"
-"\x69\xac\x22\xe9\xf3\xa7\x85\x2e\x3c\x15\xd9\x13\xca\xb0\xb8\x86"
-"\x3a\x95\xc9\x92\x94\xce\x86\x74\x21\x49\x54\x61\x03\x46\xf4\xd4"
-"\x74\xb2\x6f\x7c\x48\xb4\x2e\xe6\x8e\x1f\x57\x2a\x1f\xc4\x02\x6a"
-"\xc4\x56\xb4\xf5\x9f\x7b\x62\x1e\xa1\xb9\xd8\x8f\x64\x20\x2f\xb1";
-
-    SetKey;
-    }
-
-static int pad_unknown(void)
-{
-    unsigned long l;
-    while ((l = ERR_get_error()) != 0)
-      if (ERR_GET_REASON(l) == RSA_R_UNKNOWN_PADDING_TYPE)
-       return(1);
-    return(0);
-}
-
-static const char rnd_seed[] = "string to make the random number generator think it has entropy";
-
-int main(int argc, char *argv[])
-    {
-    int err=0;
-    int v;
-    RSA *key;
-    unsigned char ptext[256];
-    unsigned char ctext[256];
-    static unsigned char ptext_ex[] = "\x54\x85\x9b\x34\x2c\x49\xea\x2a";
-    unsigned char ctext_ex[256];
-    int plen;
-    int clen = 0;
-    int num;
-    int n;
-
-    CRYPTO_malloc_debug_init();
-    CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);
-    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-
-    RAND_seed(rnd_seed, sizeof rnd_seed); /* or OAEP may fail */
-
-    plen = sizeof(ptext_ex) - 1;
-
-    for (v = 0; v < 6; v++)
-       {
-       key = RSA_new();
-       switch (v%3) {
-    case 0:
-       clen = key1(key, ctext_ex);
-       break;
-    case 1:
-       clen = key2(key, ctext_ex);
-       break;
-    case 2:
-       clen = key3(key, ctext_ex);
-       break;
-       }
-       if (v/3 >= 1) key->flags |= RSA_FLAG_NO_CONSTTIME;
-
-       num = RSA_public_encrypt(plen, ptext_ex, ctext, key,
-                                RSA_PKCS1_PADDING);
-       if (num != clen)
-           {
-           printf("PKCS#1 v1.5 encryption failed!\n");
-           err=1;
-           goto oaep;
-           }
-  
-       num = RSA_private_decrypt(num, ctext, ptext, key,
-                                 RSA_PKCS1_PADDING);
-       if (num != plen || memcmp(ptext, ptext_ex, num) != 0)
-           {
-           printf("PKCS#1 v1.5 decryption failed!\n");
-           err=1;
-           }
-       else
-           printf("PKCS #1 v1.5 encryption/decryption ok\n");
-
-    oaep:
-       ERR_clear_error();
-       num = RSA_public_encrypt(plen, ptext_ex, ctext, key,
-                                RSA_PKCS1_OAEP_PADDING);
-       if (num == -1 && pad_unknown())
-           {
-           printf("No OAEP support\n");
-           goto next;
-           }
-       if (num != clen)
-           {
-           printf("OAEP encryption failed!\n");
-           err=1;
-           goto next;
-           }
-
-       num = RSA_private_decrypt(num, ctext, ptext, key,
-                                 RSA_PKCS1_OAEP_PADDING);
-       if (num != plen || memcmp(ptext, ptext_ex, num) != 0)
-           {
-           printf("OAEP decryption (encrypted data) failed!\n");
-           err=1;
-           }
-       else if (memcmp(ctext, ctext_ex, num) == 0)
-           printf("OAEP test vector %d passed!\n", v);
-    
-       /* Different ciphertexts (rsa_oaep.c without -DPKCS_TESTVECT).
-          Try decrypting ctext_ex */
-
-       num = RSA_private_decrypt(clen, ctext_ex, ptext, key,
-                                 RSA_PKCS1_OAEP_PADDING);
-
-       if (num != plen || memcmp(ptext, ptext_ex, num) != 0)
-           {
-           printf("OAEP decryption (test vector data) failed!\n");
-           err=1;
-           }
-       else
-           printf("OAEP encryption/decryption ok\n");
-
-       /* Try decrypting corrupted ciphertexts */
-       for(n = 0 ; n < clen ; ++n)
-           {
-           int b;
-           unsigned char saved = ctext[n];
-           for(b = 0 ; b < 256 ; ++b)
-               {
-               if(b == saved)
-                   continue;
-               ctext[n] = b;
-               num = RSA_private_decrypt(num, ctext, ptext, key,
-                                         RSA_PKCS1_OAEP_PADDING);
-               if(num > 0)
-                   {
-                   printf("Corrupt data decrypted!\n");
-                   err = 1;
-                   }
-               }
-           }
-    next:
-       RSA_free(key);
-       }
-
-    CRYPTO_cleanup_all_ex_data();
-    ERR_remove_thread_state(NULL);
-
-    CRYPTO_mem_leaks_fp(stderr);
-
-#ifdef OPENSSL_SYS_NETWARE
-    if (err) printf("ERROR: %d\n", err);
-#endif
-    return err;
-    }
-#endif
diff --git a/lib/libssl/src/crypto/srp/srptest.c b/lib/libssl/src/crypto/srp/srptest.c
deleted file mode 100644 (file)
index 04b66b4..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-#include <openssl/opensslconf.h>
-#ifdef OPENSSL_NO_SRP
-
-#include <stdio.h>
-
-int main(int argc, char *argv[])
-       {
-       printf("No SRP support\n");
-       return(0);
-       }
-
-#else
-
-#include <openssl/srp.h>
-#include <openssl/rand.h>
-#include <openssl/err.h>
-
-static void showbn(const char *name, const BIGNUM *bn)
-       {
-       fputs(name, stdout);
-       fputs(" = ", stdout);
-       BN_print_fp(stdout, bn);
-       putc('\n', stdout);
-       }
-
-#define RANDOM_SIZE 32 /* use 256 bits on each side */
-
-static int run_srp(const char *username, const char *client_pass, const char *server_pass)
-       {
-       int ret=-1;
-       BIGNUM *s = NULL;
-       BIGNUM *v = NULL;
-       BIGNUM *a = NULL;
-       BIGNUM *b = NULL;
-       BIGNUM *u = NULL;
-       BIGNUM *x = NULL;
-       BIGNUM *Apub = NULL;
-       BIGNUM *Bpub = NULL;
-       BIGNUM *Kclient = NULL;
-       BIGNUM *Kserver = NULL;
-       unsigned char rand_tmp[RANDOM_SIZE];
-       /* use builtin 1024-bit params */
-       SRP_gN *GN = SRP_get_default_gN("1024");
-
-       if(GN == NULL)
-               {
-               fprintf(stderr, "Failed to get SRP parameters\n");
-               return -1;
-               }
-       /* Set up server's password entry */
-       if(!SRP_create_verifier_BN(username, server_pass, &s, &v, GN->N, GN->g))
-               {
-               fprintf(stderr, "Failed to create SRP verifier\n");
-               return -1;
-               }
-
-       showbn("N", GN->N);
-       showbn("g", GN->g);
-       showbn("Salt", s);
-       showbn("Verifier", v);
-
-       /* Server random */
-       RAND_pseudo_bytes(rand_tmp, sizeof(rand_tmp));
-       b = BN_bin2bn(rand_tmp, sizeof(rand_tmp), NULL);
-       /* TODO - check b != 0 */
-       showbn("b", b);
-
-       /* Server's first message */
-       Bpub = SRP_Calc_B(b, GN->N, GN->g, v);
-       showbn("B", Bpub);
-
-       if(!SRP_Verify_B_mod_N(Bpub, GN->N))
-               {
-               fprintf(stderr, "Invalid B\n");
-               return -1;
-               }
-
-       /* Client random */
-       RAND_pseudo_bytes(rand_tmp, sizeof(rand_tmp));
-       a = BN_bin2bn(rand_tmp, sizeof(rand_tmp), NULL);
-       /* TODO - check a != 0 */
-       showbn("a", a);
-
-       /* Client's response */
-       Apub = SRP_Calc_A(a, GN->N, GN->g);
-       showbn("A", Apub);
-
-       if(!SRP_Verify_A_mod_N(Apub, GN->N))
-               {
-               fprintf(stderr, "Invalid A\n");
-               return -1;
-               }
-
-       /* Both sides calculate u */
-       u = SRP_Calc_u(Apub, Bpub, GN->N);
-
-       /* Client's key */
-       x = SRP_Calc_x(s, username, client_pass);
-       Kclient = SRP_Calc_client_key(GN->N, Bpub, GN->g, x, a, u);
-       showbn("Client's key", Kclient);
-
-       /* Server's key */
-       Kserver = SRP_Calc_server_key(Apub, v, u, b, GN->N);
-       showbn("Server's key", Kserver);
-
-       if(BN_cmp(Kclient, Kserver) == 0)
-               {
-               ret = 0;
-               }
-       else
-               {
-               fprintf(stderr, "Keys mismatch\n");
-               ret = 1;
-               }
-
-       BN_clear_free(Kclient);
-       BN_clear_free(Kserver);
-       BN_clear_free(x);
-       BN_free(u);
-       BN_free(Apub);
-       BN_clear_free(a);
-       BN_free(Bpub);
-       BN_clear_free(b);
-       BN_free(s);
-       BN_clear_free(v);
-
-       return ret;
-       }
-
-int main(int argc, char **argv)
-       {
-       BIO *bio_err;
-       bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
-
-       CRYPTO_malloc_debug_init();
-       CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);
-       CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-
-       ERR_load_crypto_strings();
-
-       /* "Negative" test, expect a mismatch */
-       if(run_srp("alice", "password1", "password2") == 0)
-               {
-               fprintf(stderr, "Mismatched SRP run failed\n");
-               return 1;
-               }
-
-       /* "Positive" test, should pass */
-       if(run_srp("alice", "password", "password") != 0)
-               {
-               fprintf(stderr, "Plain SRP run failed\n");
-               return 1;
-               }
-
-       CRYPTO_cleanup_all_ex_data();
-       ERR_remove_thread_state(NULL);
-       ERR_free_strings();
-       CRYPTO_mem_leaks(bio_err);
-
-       return 0;
-       }
-#endif
diff --git a/lib/libssl/src/crypto/whrlpool/wp_test.c b/lib/libssl/src/crypto/whrlpool/wp_test.c
deleted file mode 100644 (file)
index c68c2c6..0000000
+++ /dev/null
@@ -1,228 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2005 The OpenSSL Project.  All rights reserved.
- * ====================================================================
- */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <openssl/whrlpool.h>
-#include <openssl/crypto.h>
-
-#if defined(OPENSSL_NO_WHIRLPOOL)
-int main(int argc, char *argv[])
-{
-    printf("No Whirlpool support\n");
-    return(0);
-}
-#else
-
-/* ISO/IEC 10118-3 test vector set */
-unsigned char iso_test_1[WHIRLPOOL_DIGEST_LENGTH] = {
-       0x19,0xFA,0x61,0xD7,0x55,0x22,0xA4,0x66,
-       0x9B,0x44,0xE3,0x9C,0x1D,0x2E,0x17,0x26,
-       0xC5,0x30,0x23,0x21,0x30,0xD4,0x07,0xF8,
-       0x9A,0xFE,0xE0,0x96,0x49,0x97,0xF7,0xA7,
-       0x3E,0x83,0xBE,0x69,0x8B,0x28,0x8F,0xEB,
-       0xCF,0x88,0xE3,0xE0,0x3C,0x4F,0x07,0x57,
-       0xEA,0x89,0x64,0xE5,0x9B,0x63,0xD9,0x37,
-       0x08,0xB1,0x38,0xCC,0x42,0xA6,0x6E,0xB3 };
-
-unsigned char iso_test_2[WHIRLPOOL_DIGEST_LENGTH] = {
-       0x8A,0xCA,0x26,0x02,0x79,0x2A,0xEC,0x6F,
-       0x11,0xA6,0x72,0x06,0x53,0x1F,0xB7,0xD7,
-       0xF0,0xDF,0xF5,0x94,0x13,0x14,0x5E,0x69,
-       0x73,0xC4,0x50,0x01,0xD0,0x08,0x7B,0x42,
-       0xD1,0x1B,0xC6,0x45,0x41,0x3A,0xEF,0xF6,
-       0x3A,0x42,0x39,0x1A,0x39,0x14,0x5A,0x59,
-       0x1A,0x92,0x20,0x0D,0x56,0x01,0x95,0xE5,
-       0x3B,0x47,0x85,0x84,0xFD,0xAE,0x23,0x1A };
-
-unsigned char iso_test_3[WHIRLPOOL_DIGEST_LENGTH] = {
-       0x4E,0x24,0x48,0xA4,0xC6,0xF4,0x86,0xBB,
-       0x16,0xB6,0x56,0x2C,0x73,0xB4,0x02,0x0B,
-       0xF3,0x04,0x3E,0x3A,0x73,0x1B,0xCE,0x72,
-       0x1A,0xE1,0xB3,0x03,0xD9,0x7E,0x6D,0x4C,
-       0x71,0x81,0xEE,0xBD,0xB6,0xC5,0x7E,0x27,
-       0x7D,0x0E,0x34,0x95,0x71,0x14,0xCB,0xD6,
-       0xC7,0x97,0xFC,0x9D,0x95,0xD8,0xB5,0x82,
-       0xD2,0x25,0x29,0x20,0x76,0xD4,0xEE,0xF5 };
-
-unsigned char iso_test_4[WHIRLPOOL_DIGEST_LENGTH] = {
-       0x37,0x8C,0x84,0xA4,0x12,0x6E,0x2D,0xC6,
-       0xE5,0x6D,0xCC,0x74,0x58,0x37,0x7A,0xAC,
-       0x83,0x8D,0x00,0x03,0x22,0x30,0xF5,0x3C,
-       0xE1,0xF5,0x70,0x0C,0x0F,0xFB,0x4D,0x3B,
-       0x84,0x21,0x55,0x76,0x59,0xEF,0x55,0xC1,
-       0x06,0xB4,0xB5,0x2A,0xC5,0xA4,0xAA,0xA6,
-       0x92,0xED,0x92,0x00,0x52,0x83,0x8F,0x33,
-       0x62,0xE8,0x6D,0xBD,0x37,0xA8,0x90,0x3E };
-
-unsigned char iso_test_5[WHIRLPOOL_DIGEST_LENGTH] = {
-       0xF1,0xD7,0x54,0x66,0x26,0x36,0xFF,0xE9,
-       0x2C,0x82,0xEB,0xB9,0x21,0x2A,0x48,0x4A,
-       0x8D,0x38,0x63,0x1E,0xAD,0x42,0x38,0xF5,
-       0x44,0x2E,0xE1,0x3B,0x80,0x54,0xE4,0x1B,
-       0x08,0xBF,0x2A,0x92,0x51,0xC3,0x0B,0x6A,
-       0x0B,0x8A,0xAE,0x86,0x17,0x7A,0xB4,0xA6,
-       0xF6,0x8F,0x67,0x3E,0x72,0x07,0x86,0x5D,
-       0x5D,0x98,0x19,0xA3,0xDB,0xA4,0xEB,0x3B };
-
-unsigned char iso_test_6[WHIRLPOOL_DIGEST_LENGTH] = {
-       0xDC,0x37,0xE0,0x08,0xCF,0x9E,0xE6,0x9B,
-       0xF1,0x1F,0x00,0xED,0x9A,0xBA,0x26,0x90,
-       0x1D,0xD7,0xC2,0x8C,0xDE,0xC0,0x66,0xCC,
-       0x6A,0xF4,0x2E,0x40,0xF8,0x2F,0x3A,0x1E,
-       0x08,0xEB,0xA2,0x66,0x29,0x12,0x9D,0x8F,
-       0xB7,0xCB,0x57,0x21,0x1B,0x92,0x81,0xA6,
-       0x55,0x17,0xCC,0x87,0x9D,0x7B,0x96,0x21,
-       0x42,0xC6,0x5F,0x5A,0x7A,0xF0,0x14,0x67 };
-
-unsigned char iso_test_7[WHIRLPOOL_DIGEST_LENGTH] = {
-       0x46,0x6E,0xF1,0x8B,0xAB,0xB0,0x15,0x4D,
-       0x25,0xB9,0xD3,0x8A,0x64,0x14,0xF5,0xC0,
-       0x87,0x84,0x37,0x2B,0xCC,0xB2,0x04,0xD6,
-       0x54,0x9C,0x4A,0xFA,0xDB,0x60,0x14,0x29,
-       0x4D,0x5B,0xD8,0xDF,0x2A,0x6C,0x44,0xE5,
-       0x38,0xCD,0x04,0x7B,0x26,0x81,0xA5,0x1A,
-       0x2C,0x60,0x48,0x1E,0x88,0xC5,0xA2,0x0B,
-       0x2C,0x2A,0x80,0xCF,0x3A,0x9A,0x08,0x3B };
-
-unsigned char iso_test_8[WHIRLPOOL_DIGEST_LENGTH] = {
-       0x2A,0x98,0x7E,0xA4,0x0F,0x91,0x70,0x61,
-       0xF5,0xD6,0xF0,0xA0,0xE4,0x64,0x4F,0x48,
-       0x8A,0x7A,0x5A,0x52,0xDE,0xEE,0x65,0x62,
-       0x07,0xC5,0x62,0xF9,0x88,0xE9,0x5C,0x69,
-       0x16,0xBD,0xC8,0x03,0x1B,0xC5,0xBE,0x1B,
-       0x7B,0x94,0x76,0x39,0xFE,0x05,0x0B,0x56,
-       0x93,0x9B,0xAA,0xA0,0xAD,0xFF,0x9A,0xE6,
-       0x74,0x5B,0x7B,0x18,0x1C,0x3B,0xE3,0xFD };
-
-unsigned char iso_test_9[WHIRLPOOL_DIGEST_LENGTH] = {
-       0x0C,0x99,0x00,0x5B,0xEB,0x57,0xEF,0xF5,
-       0x0A,0x7C,0xF0,0x05,0x56,0x0D,0xDF,0x5D,
-       0x29,0x05,0x7F,0xD8,0x6B,0x20,0xBF,0xD6,
-       0x2D,0xEC,0xA0,0xF1,0xCC,0xEA,0x4A,0xF5,
-       0x1F,0xC1,0x54,0x90,0xED,0xDC,0x47,0xAF,
-       0x32,0xBB,0x2B,0x66,0xC3,0x4F,0xF9,0xAD,
-       0x8C,0x60,0x08,0xAD,0x67,0x7F,0x77,0x12,
-       0x69,0x53,0xB2,0x26,0xE4,0xED,0x8B,0x01 };
-
-int main (int argc,char *argv[])
-{ unsigned char md[WHIRLPOOL_DIGEST_LENGTH];
-  int          i;
-  WHIRLPOOL_CTX        ctx;
-
-#ifdef OPENSSL_IA32_SSE2
-    /* Alternative to this is to call OpenSSL_add_all_algorithms...
-     * The below code is retained exclusively for debugging purposes. */
-    { char      *env;
-
-       if ((env=getenv("OPENSSL_ia32cap")))
-           OPENSSL_ia32cap = strtoul (env,NULL,0);
-    }
-#endif
-
-    fprintf(stdout,"Testing Whirlpool ");
-
-    WHIRLPOOL("",0,md);
-    if (memcmp(md,iso_test_1,sizeof(iso_test_1)))
-    {   fflush(stdout);
-       fprintf(stderr,"\nTEST 1 of 9 failed.\n");
-       return 1;
-    }
-    else
-       fprintf(stdout,"."); fflush(stdout);
-
-    WHIRLPOOL("a",1,md);
-    if (memcmp(md,iso_test_2,sizeof(iso_test_2)))
-    {   fflush(stdout);
-       fprintf(stderr,"\nTEST 2 of 9 failed.\n");
-       return 1;
-    }
-    else
-       fprintf(stdout,"."); fflush(stdout);
-
-    WHIRLPOOL("abc",3,md);
-    if (memcmp(md,iso_test_3,sizeof(iso_test_3)))
-    {   fflush(stdout);
-       fprintf(stderr,"\nTEST 3 of 9 failed.\n");
-       return 1;
-    }
-    else
-       fprintf(stdout,"."); fflush(stdout);
-
-    WHIRLPOOL("message digest",14,md);
-    if (memcmp(md,iso_test_4,sizeof(iso_test_4)))
-    {   fflush(stdout);
-       fprintf(stderr,"\nTEST 4 of 9 failed.\n");
-       return 1;
-    }
-    else
-       fprintf(stdout,"."); fflush(stdout);
-
-    WHIRLPOOL("abcdefghijklmnopqrstuvwxyz",26,md);
-    if (memcmp(md,iso_test_5,sizeof(iso_test_5)))
-    {   fflush(stdout);
-       fprintf(stderr,"\nTEST 5 of 9 failed.\n");
-       return 1;
-    }
-    else
-       fprintf(stdout,"."); fflush(stdout);
-
-    WHIRLPOOL( "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-               "abcdefghijklmnopqrstuvwxyz"
-               "0123456789",62,md);
-    if (memcmp(md,iso_test_6,sizeof(iso_test_6)))
-    {   fflush(stdout);
-       fprintf(stderr,"\nTEST 6 of 9 failed.\n");
-       return 1;
-    }
-    else
-       fprintf(stdout,"."); fflush(stdout);
-
-    WHIRLPOOL( "1234567890""1234567890""1234567890""1234567890"
-               "1234567890""1234567890""1234567890""1234567890",80,md);
-    if (memcmp(md,iso_test_7,sizeof(iso_test_7)))
-    {   fflush(stdout);
-       fprintf(stderr,"\nTEST 7 of 9 failed.\n");
-       return 1;
-    }
-    else
-       fprintf(stdout,"."); fflush(stdout);
-
-    WHIRLPOOL("abcdbcdecdefdefgefghfghighijhijk",32,md);
-    if (memcmp(md,iso_test_8,sizeof(iso_test_8)))
-    {   fflush(stdout);
-       fprintf(stderr,"\nTEST 8 of 9 failed.\n");
-       return 1;
-    }
-    else
-       fprintf(stdout,"."); fflush(stdout);
-    WHIRLPOOL_Init (&ctx);
-    for (i=0;i<1000000;i+=288)
-       WHIRLPOOL_Update (&ctx, "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                               "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                               "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                               "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                               "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                               "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                               "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                               "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                               "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa",
-                               (1000000-i)<288?1000000-i:288);
-    WHIRLPOOL_Final (md,&ctx);
-    if (memcmp(md,iso_test_9,sizeof(iso_test_9)))
-    {   fflush(stdout);
-       fprintf(stderr,"\nTEST 9 of 9 failed.\n");
-       return 1;
-    }
-    else
-       fprintf(stdout,"."); fflush(stdout);
-
-    fprintf(stdout," passed.\n"); fflush(stdout);
-
-  return 0;
-}
-#endif