Add SRP.

5 files changed, 42 insertions, 3 deletions

diff --git a/util/libeay.num b/util/libeay.num
index 08808fec5d..629c8132b0 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4189,3 +4189,19 @@ CRYPTO_cts128_encrypt_block             4560	EXIST::FUNCTION:
 CRYPTO_cbc128_decrypt                   4561	EXIST::FUNCTION:
 CRYPTO_cfb128_encrypt                   4562	EXIST::FUNCTION:
 CRYPTO_cfb128_8_encrypt                 4563	EXIST::FUNCTION:
+SRP_VBASE_get_by_user                   4564	EXIST::FUNCTION:SRP
+SRP_Calc_server_key                     4565	EXIST::FUNCTION:SRP
+SRP_create_verifier                     4566	EXIST::FUNCTION:SRP
+SRP_create_verifier_BN                  4567	EXIST::FUNCTION:SRP
+SRP_Calc_u                              4568	EXIST::FUNCTION:SRP
+SRP_VBASE_free                          4569	EXIST::FUNCTION:SRP
+SRP_Calc_client_key                     4570	EXIST::FUNCTION:SRP
+SRP_get_default_gN                      4571	EXIST::FUNCTION:SRP
+SRP_Calc_x                              4572	EXIST::FUNCTION:SRP
+SRP_Calc_B                              4573	EXIST::FUNCTION:SRP
+SRP_VBASE_new                           4574	EXIST::FUNCTION:SRP
+SRP_check_known_gN_param                4575	EXIST::FUNCTION:SRP
+SRP_Calc_A                              4576	EXIST::FUNCTION:SRP
+SRP_Verify_A_mod_N                      4577	EXIST::FUNCTION:SRP
+SRP_VBASE_init                          4578	EXIST::FUNCTION:SRP
+SRP_Verify_B_mod_N                      4579	EXIST::FUNCTION:SRP
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index afe8c7326d..1542b89e64 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -104,6 +104,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
@@ -261,6 +262,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;
@@ -781,6 +783,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;
@@ -1056,6 +1060,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-err" => \$no_err,
@@ -1071,7 +1076,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 40ed2ddeb2..29cbe7dbc0 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
@@ -127,7 +127,7 @@ my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5;
 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_jpake; my $no_srp; my $no_ssl2;
 
 my $zlib;
 
@@ -218,6 +218,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; }
 	}
 
 
@@ -317,6 +318,7 @@ $crypto.=" crypto/pqueue/pqueue.h";
 $crypto.=" crypto/cms/cms.h";
 $crypto.=" crypto/jpake/jpake.h";
 $crypto.=" crypto/modes/modes.h";
+$crypto.=" crypto/srp/srp.h";
 
 my $symhacks="crypto/symhacks.h";
 
@@ -1173,6 +1175,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 6d15831450..0307dc900f 100755
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -62,6 +62,7 @@ my @dirs = (
 "crypto/pqueue",
 "crypto/whrlpool",
 "crypto/ts",
+"crypto/srp",
 "ssl",
 "apps",
 "engines",
diff --git a/util/ssleay.num b/util/ssleay.num
index 249a18ce6f..84108e023e 100755
--- a/util/ssleay.num
+++ b/util/ssleay.num
@@ -264,3 +264,17 @@ SSL_renegotiate_abbreviated             312	EXIST::FUNCTION:
 TLSv1_1_method                          313	EXIST::FUNCTION:
 TLSv1_1_client_method                   314	EXIST::FUNCTION:
 TLSv1_1_server_method                   315	EXIST::FUNCTION:
+SSL_CTX_set_srp_client_pwd_callback     316	EXIST::FUNCTION:SRP,TLSEXT
+SSL_get_srp_g                           317	EXIST::FUNCTION:SRP,TLSEXT
+SSL_CTX_set_srp_username_callback       318	EXIST::FUNCTION:SRP,TLSEXT
+SSL_get_srp_userinfo                    319	EXIST::FUNCTION:SRP,TLSEXT
+SSL_set_srp_server_param                320	EXIST::FUNCTION:SRP,TLSEXT
+SSL_set_srp_server_param_pw             321	EXIST::FUNCTION:SRP,TLSEXT
+SSL_get_srp_N                           322	EXIST::FUNCTION:SRP,TLSEXT
+SSL_get_srp_username                    323	EXIST::FUNCTION:SRP,TLSEXT
+SSL_CTX_set_srp_password                324	EXIST::FUNCTION:SRP,TLSEXT
+SSL_CTX_set_srp_strength                325	EXIST::FUNCTION:SRP,TLSEXT
+SSL_CTX_set_srp_verify_param_callback   326	EXIST::FUNCTION:SRP,TLSEXT
+SSL_CTX_set_srp_missing_srp_username_callback 327	EXIST::FUNCTION:SRP,TLSEXT
+SSL_CTX_set_srp_cb_arg                  328	EXIST::FUNCTION:SRP,TLSEXT
+SSL_CTX_set_srp_username                329	EXIST::FUNCTION:SRP,TLSEXT