81 lines
2.8 KiB
Diff
81 lines
2.8 KiB
Diff
diff -up openssl-1.0.1-beta2/apps/progs.pl.no-srp openssl-1.0.1-beta2/apps/progs.pl
|
|
--- openssl-1.0.1-beta2/apps/progs.pl.no-srp 2009-06-30 17:08:38.000000000 +0200
|
|
+++ openssl-1.0.1-beta2/apps/progs.pl 2012-02-07 01:14:08.979758307 +0100
|
|
@@ -51,6 +51,8 @@ foreach (@ARGV)
|
|
{ print "#ifndef OPENSSL_NO_CMS\n${str}#endif\n"; }
|
|
elsif ( ($_ =~ /^ocsp$/))
|
|
{ print "#ifndef OPENSSL_NO_OCSP\n${str}#endif\n"; }
|
|
+ elsif ( ($_ =~ /^srp$/))
|
|
+ { print "#ifndef OPENSSL_NO_SRP\n${str}#endif\n"; }
|
|
else
|
|
{ print $str; }
|
|
}
|
|
diff -up openssl-1.0.1-beta2/apps/s_server.c.no-srp openssl-1.0.1-beta2/apps/s_server.c
|
|
--- openssl-1.0.1-beta2/apps/s_server.c.no-srp 2012-02-07 01:04:12.000000000 +0100
|
|
+++ openssl-1.0.1-beta2/apps/s_server.c 2012-02-07 01:13:21.573362310 +0100
|
|
@@ -2248,6 +2248,7 @@ static int sv_body(char *hostname, int s
|
|
{ static count=0; if (++count == 100) { count=0; SSL_renegotiate(con); } }
|
|
#endif
|
|
k=SSL_write(con,&(buf[l]),(unsigned int)i);
|
|
+#ifndef OPENSSL_NO_SRP
|
|
while (SSL_get_error(con,k) == SSL_ERROR_WANT_X509_LOOKUP)
|
|
{
|
|
BIO_printf(bio_s_out,"LOOKUP renego during write\n");
|
|
@@ -2258,6 +2259,7 @@ static int sv_body(char *hostname, int s
|
|
BIO_printf(bio_s_out,"LOOKUP not successful\n");
|
|
k=SSL_write(con,&(buf[l]),(unsigned int)i);
|
|
}
|
|
+#endif
|
|
switch (SSL_get_error(con,k))
|
|
{
|
|
case SSL_ERROR_NONE:
|
|
@@ -2305,6 +2307,7 @@ static int sv_body(char *hostname, int s
|
|
{
|
|
again:
|
|
i=SSL_read(con,(char *)buf,bufsize);
|
|
+#ifndef OPENSSL_NO_SRP
|
|
while (SSL_get_error(con,i) == SSL_ERROR_WANT_X509_LOOKUP)
|
|
{
|
|
BIO_printf(bio_s_out,"LOOKUP renego during read\n");
|
|
@@ -2315,6 +2318,7 @@ again:
|
|
BIO_printf(bio_s_out,"LOOKUP not successful\n");
|
|
i=SSL_read(con,(char *)buf,bufsize);
|
|
}
|
|
+#endif
|
|
switch (SSL_get_error(con,i))
|
|
{
|
|
case SSL_ERROR_NONE:
|
|
@@ -2392,6 +2396,7 @@ static int init_ssl_connection(SSL *con)
|
|
|
|
|
|
i=SSL_accept(con);
|
|
+#ifndef OPENSSL_NO_SRP
|
|
while (i <= 0 && SSL_get_error(con,i) == SSL_ERROR_WANT_X509_LOOKUP)
|
|
{
|
|
BIO_printf(bio_s_out,"LOOKUP during accept %s\n",srp_callback_parm.login);
|
|
@@ -2402,6 +2407,7 @@ static int init_ssl_connection(SSL *con)
|
|
BIO_printf(bio_s_out,"LOOKUP not successful\n");
|
|
i=SSL_accept(con);
|
|
}
|
|
+#endif
|
|
if (i <= 0)
|
|
{
|
|
if (BIO_sock_should_retry(i))
|
|
@@ -2626,6 +2632,7 @@ static int www_body(char *hostname, int
|
|
if (hack)
|
|
{
|
|
i=SSL_accept(con);
|
|
+#ifndef OPENSSL_NO_SRP
|
|
while (i <= 0 && SSL_get_error(con,i) == SSL_ERROR_WANT_X509_LOOKUP)
|
|
{
|
|
BIO_printf(bio_s_out,"LOOKUP during accept %s\n",srp_callback_parm.login);
|
|
@@ -2636,7 +2643,7 @@ static int www_body(char *hostname, int
|
|
BIO_printf(bio_s_out,"LOOKUP not successful\n");
|
|
i=SSL_accept(con);
|
|
}
|
|
-
|
|
+#endif
|
|
switch (SSL_get_error(con,i))
|
|
{
|
|
case SSL_ERROR_NONE:
|