diff options
author | Rich Salz <rsalz@akamai.com> | 2016-02-14 00:17:59 -0500 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-02-17 09:46:10 -0500 |
commit | dba317774555fbd5bccdfc5270fc486e0d02d9db (patch) | |
tree | e2665b0bb6f2ee46fbaa34f048c7e349ca1f8ce7 /test | |
parent | 6a78ae2821e89a8838714496524fd39d9d21fb1b (diff) | |
download | openssl-dba317774555fbd5bccdfc5270fc486e0d02d9db.zip openssl-dba317774555fbd5bccdfc5270fc486e0d02d9db.tar.gz openssl-dba317774555fbd5bccdfc5270fc486e0d02d9db.tar.bz2 |
Remove JPAKE
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'test')
-rw-r--r-- | test/Makefile.in | 10 | ||||
-rw-r--r-- | test/build.info | 6 | ||||
-rw-r--r-- | test/jpaketest.c | 184 | ||||
-rw-r--r-- | test/recipes/90-test_jpake.t | 5 |
4 files changed, 4 insertions, 201 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index 5a1839f..0a75304 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -67,7 +67,6 @@ EVPTEST= evp_test EVPEXTRATEST=evp_extra_test P5_CRPT2_TEST= p5_crpt2_test IGETEST= igetest -JPAKETEST= jpaketest SECMEMTEST= secmemtest SRPTEST= srptest V3NAMETEST= v3nametest @@ -98,7 +97,7 @@ EXE= $(NPTEST)$(EXE_EXT) $(MEMLEAKTEST)$(EXE_EXT) \ $(BFTEST)$(EXE_EXT) $(CASTTEST)$(EXE_EXT) $(SSLTEST)$(EXE_EXT) \ $(EXPTEST)$(EXE_EXT) $(DSATEST)$(EXE_EXT) $(RSATEST)$(EXE_EXT) \ $(EVPTEST)$(EXE_EXT) $(EVPEXTRATEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) \ - $(JPAKETEST)$(EXE_EXT) $(SECMEMTEST)$(EXE_EXT) \ + $(SECMEMTEST)$(EXE_EXT) \ $(SRPTEST)$(EXE_EXT) $(V3NAMETEST)$(EXE_EXT) \ $(HEARTBEATTEST)$(EXE_EXT) $(P5_CRPT2_TEST)$(EXE_EXT) \ $(CONSTTIMETEST)$(EXE_EXT) $(VERIFYEXTRATEST)$(EXE_EXT) \ @@ -117,7 +116,7 @@ OBJ= $(NPTEST).o $(MEMLEAKTEST).o \ $(MDC2TEST).o $(RMDTEST).o $(DANETEST).o \ $(RANDTEST).o $(DHTEST).o $(ENGINETEST).o $(CASTTEST).o \ $(BFTEST).o $(SSLTEST).o $(DSATEST).o $(EXPTEST).o $(RSATEST).o \ - $(EVPTEST).o $(EVPEXTRATEST).o $(IGETEST).o $(JPAKETEST).o $(V3NAMETEST).o \ + $(EVPTEST).o $(EVPEXTRATEST).o $(IGETEST).o $(V3NAMETEST).o \ $(HEARTBEATTEST).o $(P5_CRPT2_TEST).o \ $(CONSTTIMETEST).o $(VERIFYEXTRATEST).o $(CLIENTHELLOTEST).o \ $(PACKETTEST).o $(ASYNCTEST).o $(DTLSV1LISTENTEST).o testutil.o @@ -131,7 +130,7 @@ SRC= $(NPTEST).c $(MEMLEAKTEST).c \ $(DESTEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \ $(RANDTEST).c $(DHTEST).c $(ENGINETEST).c $(CASTTEST).c \ $(BFTEST).c $(SSLTEST).c $(DSATEST).c $(EXPTEST).c $(RSATEST).c \ - $(EVPTEST).c $(EVPEXTRATEST).c $(IGETEST).c $(JPAKETEST).c $(V3NAMETEST).c \ + $(EVPTEST).c $(EVPEXTRATEST).c $(IGETEST).c $(V3NAMETEST).c \ $(HEARTBEATTEST).c $(P5_CRPT2_TEST).c \ $(CONSTTIMETEST).c $(VERIFYEXTRATEST).c $(CLIENTHELLOTEST).c \ $(PACKETTEST).c $(ASYNCTEST).c $(DTLSV1LISTENTEST).c testutil.c @@ -340,9 +339,6 @@ $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO) $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO) @target=$(IGETEST); $(BUILD_CMD) -$(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO) - @target=$(JPAKETEST); $(BUILD_CMD) - $(SECMEMTEST)$(EXE_EXT): $(SECMEMTEST).o $(DLIBCRYPTO) @target=$(SECMEMTEST); $(BUILD_CMD) diff --git a/test/build.info b/test/build.info index a321692..39b052f 100644 --- a/test/build.info +++ b/test/build.info @@ -9,7 +9,7 @@ PROGRAMS=\ mdc2test rmdtest \ randtest dhtest enginetest casttest \ bftest ssltest dsatest exptest rsa_test \ - evp_test evp_extra_test igetest jpaketest v3nametest \ + evp_test evp_extra_test igetest v3nametest \ danetest heartbeat_test p5_crpt2_test \ constant_time_test verify_extra_test clienthellotest \ packettest asynctest secmemtest srptest memleaktest \ @@ -151,10 +151,6 @@ SOURCE[igetest]=igetest.c INCLUDE[igetest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include DEPEND[igetest]=../libcrypto -SOURCE[jpaketest]=jpaketest.c -INCLUDE[jpaketest]={- rel2abs(catdir($builddir,"../include")) -} ../include -DEPEND[jpaketest]=../libcrypto - SOURCE[v3nametest]=v3nametest.c INCLUDE[v3nametest]={- rel2abs(catdir($builddir,"../include")) -} ../include DEPEND[v3nametest]=../libcrypto diff --git a/test/jpaketest.c b/test/jpaketest.c deleted file mode 100644 index 2b61705..0000000 --- a/test/jpaketest.c +++ /dev/null @@ -1,184 +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(); -#ifndef OPENSSL_NO_CRYPTO_MDEBUG - BIO *bio_err; - - bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT); - - CRYPTO_set_mem_debug(1); - CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); -#endif - - /*- - 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); - -#ifndef OPENSSL_NO_CRYPTO_MDEBUG - if (CRYPTO_mem_leaks(bio_err) <= 0) - return 1; -#endif - - return 0; -} - -#endif diff --git a/test/recipes/90-test_jpake.t b/test/recipes/90-test_jpake.t deleted file mode 100644 index 519bf1e..0000000 --- a/test/recipes/90-test_jpake.t +++ /dev/null @@ -1,5 +0,0 @@ -#! /usr/bin/perl - -use OpenSSL::Test::Simple; - -simple_test("test_jpake", "jpaketest", "jpake"); |