Commit aa82db4f authored by Ulf Möller's avatar Ulf Möller
Browse files

Add missing #ifndefs that caused missing symbols when building libssl 

as a shared library without RSA.  Use #ifndef NO_SSL2 instead of
NO_RSA in ssl/s2*.c.

Submitted by: Kris Kennaway <kris@hub.freebsd.org>
Modified by Ulf Möller
parent b0bb2b91

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ 


 Changes between 0.9.4 and 0.9.5  [xx XXX 1999]



  *) Add missing #ifndefs that caused missing symbols when building libssl

     as a shared library without RSA.  Use #ifndef NO_SSL2 instead of

     NO_RSA in ssl/s2*.c. 

     [Kris Kennaway <kris@hub.freebsd.org>, modified by Ulf Möller]



  *) Precautions against using the PRNG uninitialized: RAND_bytes() now

     has a return value which indicates the quality of the random data

     (1 = ok, 0 = not seeded).  Also an error is recorded on the thread's

Configure

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ my %table=( 
"debug-ben-strict",	"gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown):::::",

"debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",

"debug-bodo",	"gcc:-DBIO_PAIR_DEBUG -DL_ENDIAN -DREF_CHECK -DCRYPTO_MDEBUG_ALL -g -m486 -pedantic -Wshadow -Wall::-D_REENTRANT::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",

"debug-ulf",	"gcc:-DL_ENDIAN -DREF_CHECK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -O2 -m486 -Wall  -pedantic -Wall -Wshadow -pipe::-D_REENTRANT::$x86_gcc_des $x86_gcc_opts:$x86_elf_asm",

"debug-ulf",	"gcc:-DL_ENDIAN -DREF_CHECK -DCRYPTO_MDEBUG_ALL -g -O2 -m486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT::$x86_gcc_des $x86_gcc_opts:$x86_elf_asm",

"dist",		"cc:-O::(unknown):::::",



# Basic configs that should work on any box

apps/ciphers.c

+0 −4
Original line number Diff line number Diff line
@@ -66,10 +66,6 @@ 
#include <openssl/err.h>

#include <openssl/ssl.h>



#if defined(NO_RSA) && !defined(NO_SSL2)

#define NO_SSL2

#endif



#undef PROG

#define PROG	ciphers_main

apps/s_client.c

+0 −4
Original line number Diff line number Diff line
@@ -91,10 +91,6 @@ typedef unsigned int u_int; 
#undef FIONBIO

#endif



#if defined(NO_RSA) && !defined(NO_SSL2)

#define NO_SSL2

#endif



#undef PROG

#define PROG	s_client_main

apps/s_server.c

+0 −4
Original line number Diff line number Diff line
@@ -94,10 +94,6 @@ typedef unsigned int u_int; 
#undef FIONBIO

#endif



#if defined(NO_RSA) && !defined(NO_SSL2)

#define NO_SSL2

#endif



#ifndef NO_RSA

static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength);

#endif