diff options
Diffstat (limited to 'util')
-rwxr-xr-x | util/libeay.num | 16 | ||||
-rwxr-xr-x | util/mk1mf.pl | 7 | ||||
-rwxr-xr-x | util/mkdef.pl | 6 | ||||
-rwxr-xr-x | util/mkfiles.pl | 1 | ||||
-rwxr-xr-x | util/ssleay.num | 14 |
5 files changed, 42 insertions, 2 deletions
diff --git a/util/libeay.num b/util/libeay.num index 531b50f32b..d5cf594f71 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -4260,3 +4260,19 @@ EVP_aes_128_gcm 4630 EXIST::FUNCTION:AES CRYPTO_gcm128_tag 4631 EXIST::FUNCTION: EVP_aes_192_gcm 4632 EXIST::FUNCTION:AES EVP_aes_256_gcm 4633 EXIST::FUNCTION:AES +SRP_VBASE_get_by_user 4634 EXIST::FUNCTION:SRP +SRP_Calc_server_key 4635 EXIST::FUNCTION:SRP +SRP_create_verifier 4636 EXIST::FUNCTION:SRP +SRP_create_verifier_BN 4637 EXIST::FUNCTION:SRP +SRP_Calc_u 4638 EXIST::FUNCTION:SRP +SRP_VBASE_free 4639 EXIST::FUNCTION:SRP +SRP_Calc_client_key 4640 EXIST::FUNCTION:SRP +SRP_get_default_gN 4641 EXIST::FUNCTION:SRP +SRP_Calc_x 4642 EXIST::FUNCTION:SRP +SRP_Calc_B 4643 EXIST::FUNCTION:SRP +SRP_VBASE_new 4644 EXIST::FUNCTION:SRP +SRP_check_known_gN_param 4645 EXIST::FUNCTION:SRP +SRP_Calc_A 4646 EXIST::FUNCTION:SRP +SRP_Verify_A_mod_N 4647 EXIST::FUNCTION:SRP +SRP_VBASE_init 4648 EXIST::FUNCTION:SRP +SRP_Verify_B_mod_N 4649 EXIST::FUNCTION:SRP diff --git a/util/mk1mf.pl b/util/mk1mf.pl index cb104f8097..afad229ebc 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -121,6 +121,7 @@ and [options] can be one of just-ssl - remove all non-ssl keys/digest no-asm - No x86 asm no-krb5 - No KRB5 + no-srp - No SRP no-ec - No EC no-ecdsa - No ECDSA no-ecdh - No ECDH @@ -278,6 +279,7 @@ $cflags.=" -DOPENSSL_NO_SOCK" if $no_sock; $cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2; $cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3; $cflags.=" -DOPENSSL_NO_TLSEXT" if $no_tlsext; +$cflags.=" -DOPENSSL_NO_SRP" if $no_srp; $cflags.=" -DOPENSSL_NO_CMS" if $no_cms; $cflags.=" -DOPENSSL_NO_ERR" if $no_err; $cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5; @@ -1029,6 +1031,8 @@ sub var_add @a=grep(!/(^sha1)|(_sha1$)|(m_dss1$)/,@a) if $no_sha1; @a=grep(!/_mdc2$/,@a) if $no_mdc2; + @a=grep(!/(srp)/,@a) if $no_srp; + @a=grep(!/^engine$/,@a) if $no_engine; @a=grep(!/^hw$/,@a) if $no_hw; @a=grep(!/(^rsa$)|(^genrsa$)/,@a) if $no_rsa; @@ -1308,6 +1312,7 @@ sub read_options "no-ssl2" => \$no_ssl2, "no-ssl3" => \$no_ssl3, "no-tlsext" => \$no_tlsext, + "no-srp" => \$no_srp, "no-cms" => \$no_cms, "no-jpake" => \$no_jpake, "no-ec2m" => \$no_ec2m, @@ -1324,7 +1329,7 @@ sub read_options [\$no_rc2, \$no_idea, \$no_des, \$no_bf, \$no_cast, \$no_md2, \$no_sha, \$no_mdc2, \$no_dsa, \$no_dh, \$no_ssl2, \$no_err, \$no_ripemd, \$no_rc5, - \$no_aes, \$no_camellia, \$no_seed], + \$no_aes, \$no_camellia, \$no_seed, \$no_srp], "rsaref" => 0, "gcc" => \$gcc, "debug" => \$debug, diff --git a/util/mkdef.pl b/util/mkdef.pl index 3ccd542f69..9bf01ffb53 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -98,7 +98,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", # RFC3779 "RFC3779", # TLS - "TLSEXT", "PSK", + "TLSEXT", "PSK", "SRP", # CMS "CMS", # CryptoAPI Engine @@ -130,6 +130,7 @@ my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated; my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng; my $no_jpake; my $no_ssl2; my $no_ec2m; my $no_nextprotoneg; +my $no_srp; my $fips; @@ -225,6 +226,7 @@ foreach (@ARGV, split(/ /, $options)) elsif (/^no-ssl2$/) { $no_ssl2=1; } elsif (/^no-capieng$/) { $no_capieng=1; } elsif (/^no-jpake$/) { $no_jpake=1; } + elsif (/^no-srp$/) { $no_srp=1; } } @@ -323,6 +325,7 @@ $crypto.=" crypto/krb5/krb5_asn.h"; $crypto.=" crypto/pqueue/pqueue.h"; $crypto.=" crypto/cms/cms.h"; $crypto.=" crypto/jpake/jpake.h"; +$crypto.=" crypto/srp/srp.h"; $crypto.=" crypto/modes/modes.h"; $crypto.=" fips/fips.h fips/rand/fips_rand.h"; @@ -1180,6 +1183,7 @@ sub is_valid if ($keyword eq "SSL2" && $no_ssl2) { return 0; } if ($keyword eq "CAPIENG" && $no_capieng) { return 0; } if ($keyword eq "JPAKE" && $no_jpake) { return 0; } + if ($keyword eq "SRP" && $no_srp) { return 0; } if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; } # Nothing recognise as true diff --git a/util/mkfiles.pl b/util/mkfiles.pl index 66b78f417d..17b7d46957 100755 --- a/util/mkfiles.pl +++ b/util/mkfiles.pl @@ -63,6 +63,7 @@ my @dirs = ( "crypto/pqueue", "crypto/whrlpool", "crypto/ts", +"crypto/srp", "fips", "fips/aes", "fips/des", diff --git a/util/ssleay.num b/util/ssleay.num index 54966d7ddf..9f64f99aa0 100755 --- a/util/ssleay.num +++ b/util/ssleay.num @@ -274,3 +274,17 @@ SSL_CTX_set_not_resumable_session_callback 320 EXIST:!VMS:FUNCTION: SSL_CTX_set_not_resumbl_sess_cb 320 EXIST:VMS:FUNCTION: SSL_set_not_resumable_session_callback 321 EXIST:!VMS:FUNCTION: SSL_set_not_resumbl_sess_cb 321 EXIST:VMS:FUNCTION: +SSL_CTX_set_srp_client_pwd_callback 322 EXIST::FUNCTION:SRP,TLSEXT +SSL_get_srp_g 323 EXIST::FUNCTION:SRP,TLSEXT +SSL_CTX_set_srp_username_callback 324 EXIST::FUNCTION:SRP,TLSEXT +SSL_get_srp_userinfo 325 EXIST::FUNCTION:SRP,TLSEXT +SSL_set_srp_server_param 326 EXIST::FUNCTION:SRP,TLSEXT +SSL_set_srp_server_param_pw 327 EXIST::FUNCTION:SRP,TLSEXT +SSL_get_srp_N 328 EXIST::FUNCTION:SRP,TLSEXT +SSL_get_srp_username 329 EXIST::FUNCTION:SRP,TLSEXT +SSL_CTX_set_srp_password 330 EXIST::FUNCTION:SRP,TLSEXT +SSL_CTX_set_srp_strength 331 EXIST::FUNCTION:SRP,TLSEXT +SSL_CTX_set_srp_verify_param_callback 332 EXIST::FUNCTION:SRP,TLSEXT +SSL_CTX_set_srp_missing_srp_username_callback 333 EXIST::FUNCTION:SRP,TLSEXT +SSL_CTX_set_srp_cb_arg 334 EXIST::FUNCTION:SRP,TLSEXT +SSL_CTX_set_srp_username 335 EXIST::FUNCTION:SRP,TLSEXT |