diff options
| -rw-r--r-- | ssl/s23_srvr.c | 5 | ||||
| -rw-r--r-- | ssl/s3_srvr.c | 2 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 2 | ||||
| -rw-r--r-- | util/selftest.pl | 18 |
4 files changed, 23 insertions, 4 deletions
diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c index 5b38f9e285..6a3bbb10b9 100644 --- a/ssl/s23_srvr.c +++ b/ssl/s23_srvr.c @@ -206,8 +206,11 @@ int ssl23_get_client_hello(SSL *s) unsigned int i; unsigned int csl,sil,cl; int n=0,j; - int type=0,use_sslv2_strong=0; + int type=0; int v[2]; +#ifndef NO_RSA + int use_sslv2_strong=0; +#endif if (s->state == SSL23_ST_SR_CLNT_HELLO_A) { diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 2a9e115e9c..7c6993643f 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -1326,7 +1326,6 @@ static int ssl3_get_client_key_exchange(SSL *s) SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_PROTOCOL_VERSION_NUMBER); goto f_err; } -#endif s->session->master_key_length= s->method->ssl3_enc->generate_master_secret(s, @@ -1335,6 +1334,7 @@ static int ssl3_get_client_key_exchange(SSL *s) memset(p,0,i); } else +#endif #ifndef NO_DH if (l & (SSL_kEDH|SSL_kDHr|SSL_kDHd)) { diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 5af71b5545..3e52a8bce1 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -81,11 +81,13 @@ OPENSSL_GLOBAL SSL3_ENC_METHOD ssl3_undef_enc_method={ (int (*)(SSL *, EVP_MD_CTX *, EVP_MD_CTX *, const char*, int, unsigned char *))ssl_undefined_function }; +#ifndef NO_RSA union rsa_fn_to_char_u { char *char_p; RSA *(*fn_p)(SSL *, int, int); }; +#endif union dh_fn_to_char_u { diff --git a/util/selftest.pl b/util/selftest.pl index ad0a6ab2d3..beb36b1a9e 100644 --- a/util/selftest.pl +++ b/util/selftest.pl @@ -25,6 +25,7 @@ open(OUT,">$report") or die; print OUT "OpenSSL self-test report:\n\n"; $uname=`uname -a`; +$uname="??" if $uname eq ""; $c=`sh config -t`; foreach $_ (split("\n",$c)) { @@ -48,6 +49,7 @@ if (open(IN,"<Makefile.ssl")) { $cversion=`$cc -v 2>&1`; $cversion=`$cc -V 2>&1` if $cversion =~ "usage"; +$cversion=`$cc --version` if $cversion eq ""; $cversion =~ s/Reading specs.*\n//; $cversion =~ s/usage.*\n//; chomp $cversion; @@ -64,6 +66,7 @@ if (open(IN,"<CHANGES")) { print OUT "OpenSSL version: $version\n"; print OUT "Last change: $last...\n"; +print OUT "Options: $options\n" if $options ne ""; print OUT "OS (uname): $uname"; print OUT "OS (config): $os\n"; print OUT "Target (default): $platform0\n"; @@ -117,6 +120,14 @@ if (system("make 2>&1 | tee make.log") > 255) { goto err; } +$_=$options; +s/no-asm//; +if (/no-/) +{ + print OUT "Test skipped.\n"; + goto err; +} + print "Running make test...\n"; if (system("make test 2>&1 | tee make.log") > 255) { @@ -153,8 +164,11 @@ close(OUT); print "\n"; open(IN,"<$report") or die; while (<IN>) { - last if /$sep/; + if (/$sep/) { + print "[...]\n"; + last; + } print; } -print "Test report in file $report\n"; +print "\nTest report in file $report\n"; |