Remove JPAKE

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
This commit is contained in:
Rich Salz
2016-02-14 00:17:59 -05:00
committed by Rich Salz
parent 6a78ae2821
commit dba3177745
25 changed files with 19 additions and 1374 deletions

View File

@@ -297,13 +297,6 @@
-T IPAddressOrRange
-T IPAddressOrRanges
-T ISSUING_DIST_POINT
-T JPAKE_CTX
-T JPAKE_STEP1
-T JPAKE_STEP2
-T JPAKE_STEP3A
-T JPAKE_STEP3B
-T JPAKE_STEP_PART
-T JPAKE_ZKP
-T KEY_TABLE_TYPE
-T LHASH
-T LHASH_COMP_FN_TYPE

View File

@@ -3616,27 +3616,6 @@ CRYPTO_dbg_remove_all_info 4090 1_1_0 NOEXIST::FUNCTION:
OPENSSL_init 4091 1_1_0 EXIST::FUNCTION:
private_Camellia_set_key 4092 1_1_0 NOEXIST::FUNCTION:
CRYPTO_strdup 4093 1_1_0 EXIST::FUNCTION:
JPAKE_STEP3A_process 4094 1_1_0 EXIST::FUNCTION:JPAKE
JPAKE_STEP1_release 4095 1_1_0 EXIST::FUNCTION:JPAKE
JPAKE_get_shared_key 4096 1_1_0 EXIST::FUNCTION:JPAKE
JPAKE_STEP3B_init 4097 1_1_0 EXIST::FUNCTION:JPAKE
JPAKE_STEP1_generate 4098 1_1_0 EXIST::FUNCTION:JPAKE
JPAKE_STEP1_init 4099 1_1_0 EXIST::FUNCTION:JPAKE
JPAKE_STEP3B_process 4100 1_1_0 EXIST::FUNCTION:JPAKE
JPAKE_STEP2_generate 4101 1_1_0 EXIST::FUNCTION:JPAKE
JPAKE_CTX_new 4102 1_1_0 EXIST::FUNCTION:JPAKE
JPAKE_CTX_free 4103 1_1_0 EXIST::FUNCTION:JPAKE
JPAKE_STEP3B_release 4104 1_1_0 EXIST::FUNCTION:JPAKE
JPAKE_STEP3A_release 4105 1_1_0 EXIST::FUNCTION:JPAKE
JPAKE_STEP2_process 4106 1_1_0 EXIST::FUNCTION:JPAKE
JPAKE_STEP3B_generate 4107 1_1_0 EXIST::FUNCTION:JPAKE
JPAKE_STEP1_process 4108 1_1_0 EXIST::FUNCTION:JPAKE
JPAKE_STEP3A_generate 4109 1_1_0 EXIST::FUNCTION:JPAKE
JPAKE_STEP2_release 4110 1_1_0 EXIST::FUNCTION:JPAKE
JPAKE_STEP3A_init 4111 1_1_0 EXIST::FUNCTION:JPAKE
ERR_load_JPAKE_strings 4112 1_1_0 EXIST::FUNCTION:JPAKE
JPAKE_STEP2_init 4113 1_1_0 EXIST::FUNCTION:JPAKE
pqueue_size 4114 1_1_0 NOEXIST::FUNCTION:
i2d_TS_ACCURACY 4115 1_1_0 EXIST::FUNCTION:
i2d_TS_MSG_IMPRINT_fp 4116 1_1_0 EXIST::FUNCTION:STDIO
i2d_TS_MSG_IMPRINT 4117 1_1_0 EXIST::FUNCTION:

View File

@@ -306,7 +306,6 @@ $cflags.=" -DOPENSSL_NO_ASYNC" if $no_async;
$cflags.=" -DOPENSSL_NO_AUTOALGINIT" if $no_autoalginit;
$cflags.=" -DOPENSSL_NO_AUTOERRINIT" if $no_autoerrinit;
$cflags.=" -DOPENSSL_FIPS" if $fips;
$cflags.=" -DOPENSSL_NO_JPAKE" if $no_jpake;
$cflags.=" -DOPENSSL_NO_EC2M" if $no_ec2m;
$cflags.= " -DZLIB" if $zlib_opt;
$cflags.= " -DZLIB_SHARED" if $zlib_opt == 2;
@@ -1037,7 +1036,6 @@ sub var_add
return("") if $no_dh && $dir =~ /\/dh/;
return("") if $no_ec && $dir =~ /\/ec/;
return("") if $no_cms && $dir =~ /\/cms/;
return("") if $no_jpake && $dir =~ /\/jpake/;
return("") if !$fips && $dir =~ /^fips/;
if ($no_des && $dir =~ /\/des/)
{
@@ -1397,7 +1395,6 @@ sub read_options
"no-ssl3-method" => 0,
"no-srp" => \$no_srp,
"no-cms" => \$no_cms,
"no-jpake" => \$no_jpake,
"no-ec2m" => \$no_ec2m,
"no-ec_nistp_64_gcc_128" => 0,
"no-err" => \$no_err,

View File

@@ -102,8 +102,6 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
"CAPIENG",
# SSL v3 method
"SSL3_METHOD",
# JPAKE
"JPAKE",
# NEXTPROTONEG
"NEXTPROTONEG",
# Deprecated functions
@@ -293,7 +291,6 @@ $crypto.=" include/openssl/ocsp.h";
$crypto.=" include/openssl/ui.h";
#$crypto.=" include/openssl/store.h";
$crypto.=" include/openssl/cms.h";
$crypto.=" include/openssl/jpake.h";
$crypto.=" include/openssl/srp.h";
$crypto.=" include/openssl/modes.h";
$crypto.=" include/openssl/async.h";

View File

@@ -48,7 +48,6 @@ my @dirs = (
"crypto/x509v3",
"crypto/cms",
"crypto/conf",
"crypto/jpake",
"crypto/txt_db",
"crypto/pkcs7",
"crypto/pkcs12",