generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix NO_RSA (misplaced #endif).

Browse Source
This commit is contained in:
Ulf Möller 2000-02-24 04:41:03 +00:00
parent 390ead1e9a
commit 4c5fac4ac4
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ssl/s23_srvr.c
View File

@ -206,8 +206,11 @@ int ssl23_get_client_hello(SSL *s)
unsigned int i; unsigned int i;
unsigned int csl,sil,cl; unsigned int csl,sil,cl;
int n=0,j; int n=0,j;
int type=0,use_sslv2_strong=0; int type=0;
int v[2]; int v[2];
#ifndef NO_RSA
int use_sslv2_strong=0;
#endif
if (s->state == SSL23_ST_SR_CLNT_HELLO_A) if (s->state == SSL23_ST_SR_CLNT_HELLO_A)
{ {

2
ssl/s3_srvr.c
View File

@ -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); SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_PROTOCOL_VERSION_NUMBER);
goto f_err; goto f_err;
} }
#endif
s->session->master_key_length= s->session->master_key_length=
s->method->ssl3_enc->generate_master_secret(s, 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); memset(p,0,i);
} }
else else
#endif
#ifndef NO_DH #ifndef NO_DH
if (l & (SSL_kEDH|SSL_kDHr|SSL_kDHd)) if (l & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
{ {

2
ssl/ssl_lib.c
View File

@ -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 (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 union rsa_fn_to_char_u
{ {
char *char_p; char *char_p;
RSA *(*fn_p)(SSL *, int, int); RSA *(*fn_p)(SSL *, int, int);
}; };
#endif
union dh_fn_to_char_u union dh_fn_to_char_u
{ {

18
util/selftest.pl
View File

@ -25,6 +25,7 @@ open(OUT,">$report") or die;
print OUT "OpenSSL self-test report:\n\n"; print OUT "OpenSSL self-test report:\n\n";
$uname=`uname -a`; $uname=`uname -a`;
$uname="??" if $uname eq "";
$c=`sh config -t`; $c=`sh config -t`;
foreach $_ (split("\n",$c)) { foreach $_ (split("\n",$c)) {
@ -48,6 +49,7 @@ if (open(IN,"<Makefile.ssl")) {
$cversion=`$cc -v 2>&1`; $cversion=`$cc -v 2>&1`;
$cversion=`$cc -V 2>&1` if $cversion =~ "usage"; $cversion=`$cc -V 2>&1` if $cversion =~ "usage";
$cversion=`$cc --version` if $cversion eq "";
$cversion =~ s/Reading specs.*\n//; $cversion =~ s/Reading specs.*\n//;
$cversion =~ s/usage.*\n//; $cversion =~ s/usage.*\n//;
chomp $cversion; chomp $cversion;
@ -64,6 +66,7 @@ if (open(IN,"<CHANGES")) {
print OUT "OpenSSL version: $version\n"; print OUT "OpenSSL version: $version\n";
print OUT "Last change: $last...\n"; print OUT "Last change: $last...\n";
print OUT "Options: $options\n" if $options ne "";
print OUT "OS (uname): $uname"; print OUT "OS (uname): $uname";
print OUT "OS (config): $os\n"; print OUT "OS (config): $os\n";
print OUT "Target (default): $platform0\n"; print OUT "Target (default): $platform0\n";
@ -117,6 +120,14 @@ if (system("make 2>&1 | tee make.log") > 255) {
goto err; goto err;
} }
$_=$options;
s/no-asm//;
if (/no-/)
{
print OUT "Test skipped.\n";
goto err;
}
print "Running make test...\n"; print "Running make test...\n";
if (system("make test 2>&1 | tee make.log") > 255) if (system("make test 2>&1 | tee make.log") > 255)
{ {
@ -153,8 +164,11 @@ close(OUT);
print "\n"; print "\n";
open(IN,"<$report") or die; open(IN,"<$report") or die;
while (<IN>) { while (<IN>) {
last if /$sep/; if (/$sep/) {
print "[...]\n";
last;
}
print; print;
} }
print "Test report in file $report\n"; print "\nTest report in file $report\n";