From ccb9643f02cbc57f2e88927ca8eef0189d92fc5a Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 8 Nov 2000 17:51:37 +0000 Subject: [PATCH] Remove references to RSAref. The glue library is but a memory to fade away now... --- CHANGES | 3 +++ Configure | 9 ++++----- INSTALL | 3 --- Makefile.org | 3 +-- TABLE | 24 ++++++++++++------------ apps/makeapps.com | 1 + apps/speed.c | 2 +- crypto/crypto-lib.com | 1 + crypto/engine/Makefile.ssl | 20 ++++++++++++++++++++ crypto/err/err_all.c | 4 ++-- crypto/err/openssl.ec | 1 - crypto/rsa/rsa_lib.c | 2 +- doc/crypto/RSA_public_encrypt.pod | 4 ---- doc/crypto/RSA_set_method.pod | 22 +++++----------------- doc/crypto/rsa.pod | 1 - makevms.com | 9 ++++++--- openssl.spec | 6 +++--- ssl/ssl-lib.com | 1 + test/maketests.com | 1 + util/libeay.num | 6 ++++++ util/mk1mf.pl | 5 ++--- util/mkdef.pl | 4 ++-- util/mkerr.pl | 2 +- util/mkfiles.pl | 1 - util/mkstack.pl | 2 +- 25 files changed, 74 insertions(+), 63 deletions(-) diff --git a/CHANGES b/CHANGES index df8d4b19da..518db59a6c 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,9 @@ Changes between 0.9.6 and 0.9.7 [xx XXX 2000] + *) Remove all references to RSAref, since there's no more need for it. + [Richard Levitte] + *) Increase BN_CTX_NUM (the number of BIGNUMs in a BN_CTX) to 16. The previous value, 12, was not always sufficient for BN_mod_exp(). [Bodo Moeller] diff --git a/Configure b/Configure index 2215a3120a..944ffe90b6 100755 --- a/Configure +++ b/Configure @@ -10,7 +10,7 @@ use strict; # see INSTALL for instructions. -my $usage="Usage: Configure [no- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [rsaref] [no-threads] [no-asm] [no-dso] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] os/compiler[:flags]\n"; +my $usage="Usage: Configure [no- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [no-threads] [no-asm] [no-dso] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] os/compiler[:flags]\n"; # Options: # @@ -28,7 +28,6 @@ my $usage="Usage: Configure [no- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [- # are always compiled but return NULL if the hardware # support isn't compiled. # no-hw do not compile support for any crypto hardware. -# rsaref use RSAref # [no-]threads [don't] try to create a library that is suitable for # multithreaded applications (default is "threads" if we # know how to do it) @@ -564,9 +563,9 @@ PROCESS_ARGS: { $processor=386; } elsif (/^rsaref$/) { - $libs.= "-lRSAglue -lrsaref "; - $flags.= "-DRSAref "; - $openssl_other_defines .= "#define RSAref\n"; + # No RSAref support any more since it's not needed. + # The check for the option is there so scripts aren't + # broken } elsif (/^[-+]/) { diff --git a/INSTALL b/INSTALL index ea9b8a3844..ca4d403a36 100644 --- a/INSTALL +++ b/INSTALL @@ -43,9 +43,6 @@ --openssldir=DIR Directory for OpenSSL files. If no prefix is specified, the library files and binaries are also installed there. - rsaref Build with RSADSI's RSAREF toolkit (this assumes that - librsaref.a is in the library search path). - no-threads Don't try to build with support for multi-threaded applications. diff --git a/Makefile.org b/Makefile.org index efd56d1fc5..38cbb1bc44 100644 --- a/Makefile.org +++ b/Makefile.org @@ -24,7 +24,6 @@ INSTALLTOP=/usr/local/ssl # Do not edit this manually. Use Configure --openssldir=DIR do change this! OPENSSLDIR=/usr/local/ssl -# RSAref - Define if we are to link with RSAref. # NO_IDEA - Define to build without the IDEA algorithm # NO_RC4 - Define to build without the RC4 algorithm # NO_RC2 - Define to build without the RC2 algorithm @@ -154,7 +153,7 @@ RMD160_ASM_OBJ= asm/rm86-out.o # we might set SHLIB_MARK to '$(SHARED_LIBS)'. SHLIB_MARK= -DIRS= crypto ssl rsaref $(SHLIB_MARK) apps test tools +DIRS= crypto ssl $(SHLIB_MARK) apps test tools SHLIBDIRS= crypto ssl # dirs in crypto to build diff --git a/TABLE b/TABLE index 8482bda953..6c24e75778 100644 --- a/TABLE +++ b/TABLE @@ -1160,7 +1160,7 @@ $cc = cc $cflags = -DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z $unistd = $thread_cflag = (unknown) -$lflags = -ldld +$lflags = -Wl,+s -ldld $bn_ops = DES_PTR DES_UNROLL DES_RISC1 $bn_obj = $des_obj = @@ -1181,7 +1181,7 @@ $cc = gcc $cflags = -DB_ENDIAN -DBN_DIV2W -O3 $unistd = $thread_cflag = (unknown) -$lflags = -ldld +$lflags = -Wl,+s -ldld $bn_ops = DES_PTR DES_UNROLL DES_RISC1 $bn_obj = $des_obj = @@ -1202,7 +1202,7 @@ $cc = cc $cflags = -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3 -z $unistd = $thread_cflag = (unknown) -$lflags = -ldld +$lflags = -Wl,+s -ldld $bn_ops = BN_LLONG DES_PTR DES_UNROLL DES_RISC1 $bn_obj = $des_obj = @@ -1223,7 +1223,7 @@ $cc = gcc $cflags = -DB_ENDIAN -DBN_DIV2W -O3 $unistd = $thread_cflag = (unknown) -$lflags = -ldld +$lflags = -Wl,+s -ldld $bn_ops = BN_LLONG DES_PTR DES_UNROLL DES_RISC1 $bn_obj = $des_obj = @@ -1244,7 +1244,7 @@ $cc = cc $cflags = +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY $unistd = $thread_cflag = -D_REENTRANT -$lflags = -ldld +$lflags = -Wl,+s -ldld $bn_ops = MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT $bn_obj = $des_obj = @@ -1286,7 +1286,7 @@ $cc = gcc $cflags = -O3 -DB_ENDIAN -DBN_DIV2W $unistd = $thread_cflag = -$lflags = -ldld +$lflags = -Wl,+s -ldld $bn_ops = BN_LLONG DES_PTR DES_UNROLL DES_RISC1 $bn_obj = $des_obj = @@ -1307,7 +1307,7 @@ $cc = cc $cflags = +DA1.1 +DS1.1 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY $unistd = $thread_cflag = -D_REENTRANT -$lflags = -ldld +$lflags = -Wl,+s -ldld $bn_ops = MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT $bn_obj = $des_obj = @@ -1328,7 +1328,7 @@ $cc = cc $cflags = +DA2.0 +DS2.0 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY $unistd = $thread_cflag = -D_REENTRANT -$lflags = -ldld +$lflags = -Wl,+s -ldld $bn_ops = SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT $bn_obj = asm/pa-risc2.o $des_obj = @@ -1349,7 +1349,7 @@ $cc = cc $cflags = -DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z $unistd = $thread_cflag = -D_REENTRANT -$lflags = -ldld +$lflags = -Wl,+s -ldld $bn_ops = BN_LLONG DES_PTR DES_UNROLL DES_RISC1 $bn_obj = $des_obj = @@ -1370,7 +1370,7 @@ $cc = gcc $cflags = -DB_ENDIAN -DBN_DIV2W -O3 $unistd = $thread_cflag = -D_REENTRANT -$lflags = -ldld +$lflags = -Wl,+s -ldld $bn_ops = DES_PTR DES_UNROLL DES_RISC1 $bn_obj = $des_obj = @@ -1391,7 +1391,7 @@ $cc = cc $cflags = -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3 -z $unistd = $thread_cflag = -D_REENTRANT -$lflags = -ldld +$lflags = -Wl,+s -ldld $bn_ops = BN_LLONG DES_PTR DES_UNROLL DES_RISC1 $bn_obj = $des_obj = @@ -1412,7 +1412,7 @@ $cc = gcc $cflags = -DB_ENDIAN -DBN_DIV2W -O3 $unistd = $thread_cflag = -D_REENTRANT -$lflags = -ldld +$lflags = -Wl,+s -ldld $bn_ops = BN_LLONG DES_PTR DES_UNROLL DES_RISC1 $bn_obj = $des_obj = diff --git a/apps/makeapps.com b/apps/makeapps.com index 7e9d0ac8d6..e99dfa4625 100644 --- a/apps/makeapps.com +++ b/apps/makeapps.com @@ -581,6 +581,7 @@ $ CHECK_OPTIONS: $! $! Check To See If P1 Is Blank. $! +$ P1 = "NORSAREF" $ IF (P1.EQS."NORSAREF") $ THEN $! diff --git a/apps/speed.c b/apps/speed.c index 333dea6c92..92712cf464 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -547,7 +547,7 @@ int MAIN(int argc, char **argv) else #endif #ifndef NO_RSA -#ifdef RSAref +#if 0 /* was: #ifdef RSAref */ if (strcmp(*argv,"rsaref") == 0) { RSA_set_default_openssl_method(RSA_PKCS1_RSAref()); diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com index 70e3c91b34..b58de8ea0f 100644 --- a/crypto/crypto-lib.com +++ b/crypto/crypto-lib.com @@ -896,6 +896,7 @@ $ ENDIF $! $! Check To See If P2 Is Blank. $! +$ P2 = "NORSAREF" $ IF (P2.EQS."NORSAREF") $ THEN $! diff --git a/crypto/engine/Makefile.ssl b/crypto/engine/Makefile.ssl index 2823cd9583..088e9da779 100644 --- a/crypto/engine/Makefile.ssl +++ b/crypto/engine/Makefile.ssl @@ -80,6 +80,26 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. +engine_all.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +engine_all.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h +engine_all.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h +engine_all.o: ../../include/openssl/des.h ../../include/openssl/dh.h +engine_all.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h +engine_all.o: ../../include/openssl/engine.h ../../include/openssl/err.h +engine_all.o: ../../include/openssl/evp.h ../../include/openssl/idea.h +engine_all.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h +engine_all.o: ../../include/openssl/md4.h ../../include/openssl/md5.h +engine_all.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h +engine_all.o: ../../include/openssl/objects.h +engine_all.o: ../../include/openssl/opensslconf.h +engine_all.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h +engine_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h +engine_all.o: ../../include/openssl/rc5.h +engine_all.o: ../../include/openssl/rijndael-alg-fst.h +engine_all.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h +engine_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h +engine_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +engine_all.o: ../../include/openssl/symhacks.h engine_int.h engine_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h engine_err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h engine_err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index b8315d8272..d4f169ec01 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -64,7 +64,7 @@ #ifndef NO_RSA #include #endif -#ifdef RSAref +#if 0 /* was: #ifdef RSAref */ #include #endif #ifndef NO_DH @@ -98,7 +98,7 @@ void ERR_load_crypto_strings(void) ERR_load_BIO_strings(); ERR_load_CONF_strings(); #ifndef NO_RSA -#ifdef RSAref +#if 0 /* was: #ifdef RSAref */ ERR_load_RSAREF_strings(); #else ERR_load_RSA_strings(); diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec index 9bd267bda2..717c6eeba1 100644 --- a/crypto/err/openssl.ec +++ b/crypto/err/openssl.ec @@ -20,7 +20,6 @@ L CONF crypto/conf/conf.h crypto/conf/conf_err.c #L PROXY crypto/proxy/proxy.h crypto/proxy/proxy_err.c L PKCS7 crypto/pkcs7/pkcs7.h crypto/pkcs7/pkcs7err.c L PKCS12 crypto/pkcs12/pkcs12.h crypto/pkcs12/pk12err.c -L RSAREF rsaref/rsaref.h rsaref/rsar_err.c L SSL ssl/ssl.h ssl/ssl_err.c L COMP crypto/comp/comp.h crypto/comp/comp_err.c L RAND crypto/rand/rand.h crypto/rand/rand_err.c diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c index 4fee3d9649..4cde842c35 100644 --- a/crypto/rsa/rsa_lib.c +++ b/crypto/rsa/rsa_lib.c @@ -101,7 +101,7 @@ const RSA_METHOD *RSA_get_default_openssl_method(void) #ifdef RSA_NULL default_RSA_meth=RSA_null_method(); #else -#ifdef RSAref +#if 0 /* was: #ifdef RSAref default_RSA_meth=RSA_PKCS1_RSAref(); #else default_RSA_meth=RSA_PKCS1_SSLeay(); diff --git a/doc/crypto/RSA_public_encrypt.pod b/doc/crypto/RSA_public_encrypt.pod index 02edb7aa75..e20dfcb551 100644 --- a/doc/crypto/RSA_public_encrypt.pod +++ b/doc/crypto/RSA_public_encrypt.pod @@ -74,10 +74,6 @@ SSL, PKCS #1 v2.0 L, L, L, L -=head1 NOTES - -The L method supports only the RSA_PKCS1_PADDING mode. - =head1 HISTORY The B argument was added in SSLeay 0.8. RSA_NO_PADDING is diff --git a/doc/crypto/RSA_set_method.pod b/doc/crypto/RSA_set_method.pod index 46655d3bd6..14917dd35f 100644 --- a/doc/crypto/RSA_set_method.pod +++ b/doc/crypto/RSA_set_method.pod @@ -3,7 +3,7 @@ =head1 NAME RSA_set_default_method, RSA_get_default_method, RSA_set_method, -RSA_get_method, RSA_PKCS1_SSLeay, RSA_PKCS1_RSAref, +RSA_get_method, RSA_PKCS1_SSLeay, RSA_null_method, RSA_flags, RSA_new_method - select RSA method =head1 SYNOPSIS @@ -21,8 +21,6 @@ RSA_null_method, RSA_flags, RSA_new_method - select RSA method RSA_METHOD *RSA_PKCS1_SSLeay(void); - RSA_METHOD *RSA_PKCS1_RSAref(void); - RSA_METHOD *RSA_null_method(void); int RSA_flags(RSA *rsa); @@ -35,17 +33,8 @@ An B specifies the functions that OpenSSL uses for RSA operations. By modifying the method, alternative implementations such as hardware accelerators may be used. -Initially, the default is to use the OpenSSL internal implementation, -unless OpenSSL was configured with the C or C<-DRSA_NULL> -options. RSA_PKCS1_SSLeay() returns a pointer to that method. - -RSA_PKCS1_RSAref() returns a pointer to a method that uses the RSAref -library. This is the default method in the C configuration; -the function is not available in other configurations. -RSA_null_method() returns a pointer to a method that does not support -the RSA transformation. It is the default if OpenSSL is compiled with -C<-DRSA_NULL>. These methods may be useful in the USA because of a -patent on the RSA cryptosystem. +Initially, the default is to use the OpenSSL internal implementation. +RSA_PKCS1_SSLeay() returns a pointer to that method. RSA_set_default_openssl_method() makes B the default method for all B structures created later. B This is true only whilst the default engine @@ -132,9 +121,8 @@ the default engine for RSA operations is used. =head1 RETURN VALUES -RSA_PKCS1_SSLeay(), RSA_PKCS1_RSAref(), RSA_PKCS1_null_method(), -RSA_get_default_openssl_method() and RSA_get_method() return pointers to -the respective RSA_METHODs. +RSA_PKCS1_SSLeay(), RSA_PKCS1_null_method(), RSA_get_default_openssl_method() +and RSA_get_method() return pointers to the respective RSA_METHODs. RSA_set_default_openssl_method() returns no value. diff --git a/doc/crypto/rsa.pod b/doc/crypto/rsa.pod index ef0d4df205..09ad30cab1 100644 --- a/doc/crypto/rsa.pod +++ b/doc/crypto/rsa.pod @@ -37,7 +37,6 @@ rsa - RSA public key cryptosystem int RSA_set_method(RSA *rsa, ENGINE *engine); RSA_METHOD *RSA_get_method(RSA *rsa); RSA_METHOD *RSA_PKCS1_SSLeay(void); - RSA_METHOD *RSA_PKCS1_RSAref(void); RSA_METHOD *RSA_null_method(void); int RSA_flags(RSA *rsa); RSA *RSA_new_method(ENGINE *engine); diff --git a/makevms.com b/makevms.com index 15cbc9ce9d..219c5aef17 100755 --- a/makevms.com +++ b/makevms.com @@ -425,8 +425,8 @@ $ LOOP_SDIRS_END: $! $! Copy All The ".H" Files From The [.RSAREF] Directory. $! -$ EXHEADER := rsaref.h -$ COPY SYS$DISK:[.RSAREF]'EXHEADER' SYS$DISK:[.INCLUDE.OPENSSL] +$! EXHEADER := rsaref.h +$! COPY SYS$DISK:[.RSAREF]'EXHEADER' SYS$DISK:[.INCLUDE.OPENSSL] $! $! Copy All The ".H" Files From The [.SSL] Directory. $! @@ -473,6 +473,9 @@ $! $! Build The [.xxx.EXE.RSAREF]LIBRSAGLUE Library. $! $ RSAREF: +$ WRITE SYS$OUTPUT "" +$ WRITE SYS$OUTPUT "RSAref glue library not built, since it's no longer needed" +$ RETURN $! $! Tell The User What We Are Doing. $! @@ -648,7 +651,6 @@ $ WRITE SYS$OUTPUT " CONFIG : Just build the [.CRYPTO]OPENSSLCONF.H fi $ WRITE SYS$OUTPUT " BUILDINF : Just build the [.CRYPTO]BUILDINF.H file." $ WRITE SYS$OUTPUT " SOFTLINKS: Just Fix The Unix soft links." $ WRITE SYS$OUTPUT " BUILDALL : Same as ALL, except CONFIG, BUILDINF and SOFTILNKS aren't done." -$ WRITE SYS$OUTPUT " RSAREF : To Build Just The [.xxx.EXE.RSAREF]LIBRSAGLUE.OLB Library." $ WRITE SYS$OUTPUT " CRYPTO : To Build Just The [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library." $ WRITE SYS$OUTPUT " CRYPTO/x : To Build Just The x Part Of The" $ WRITE SYS$OUTPUT " [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library." @@ -677,6 +679,7 @@ $ ENDIF $! $! Check To See If P2 Is Blank. $! +$ P2 = "NORSAREF" $ IF (P2.EQS."NORSAREF") $ THEN $! diff --git a/openssl.spec b/openssl.spec index 0f2856bb17..501151ab47 100644 --- a/openssl.spec +++ b/openssl.spec @@ -109,9 +109,9 @@ for x in $RPM_BUILD_ROOT/usr/man/man*/* do mv ${x} ${x}ssl done -# Install RSAref stuff -install -m644 rsaref/rsaref.h $RPM_BUILD_ROOT/usr/include/openssl -install -m644 libRSAglue.a $RPM_BUILD_ROOT/usr/lib +## Install RSAref stuff +#install -m644 rsaref/rsaref.h $RPM_BUILD_ROOT/usr/include/openssl +#install -m644 libRSAglue.a $RPM_BUILD_ROOT/usr/lib # Make backwards-compatibility symlink to ssleay ln -sf /usr/bin/openssl $RPM_BUILD_ROOT/usr/bin/ssleay diff --git a/ssl/ssl-lib.com b/ssl/ssl-lib.com index 0a8581898c..05c458d191 100644 --- a/ssl/ssl-lib.com +++ b/ssl/ssl-lib.com @@ -647,6 +647,7 @@ $ ENDIF $! $! Check To See If P2 Is Blank. $! +$ p2 = "NORSAREF" $ IF (P2.EQS."NORSAREF") $ THEN $! diff --git a/test/maketests.com b/test/maketests.com index 3eba56eb1e..0f6d90fae8 100644 --- a/test/maketests.com +++ b/test/maketests.com @@ -514,6 +514,7 @@ $ CHECK_OPTIONS: $! $! Check To See If P1 Is Blank. $! +$ P1 = "NORSAREF" $ IF (P1.EQS."NORSAREF") $ THEN $! diff --git a/util/libeay.num b/util/libeay.num index 959bf80fd2..1c845a6fee 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -2044,3 +2044,9 @@ d2i_OCSP_SIGNATURE 2632 EXIST::FUNCTION: X509_ocspid_print 2633 EXIST::FUNCTION: OCSP_request_verify 2634 EXIST::FUNCTION: i2d_OCSP_REQUEST 2635 EXIST::FUNCTION: +ENGINE_load_chil 2636 EXIST::FUNCTION: +ENGINE_load_cswift 2637 EXIST::FUNCTION: +ENGINE_load_builtin_engines 2638 EXIST::FUNCTION: +bn_dup_expand 2639 EXIST::FUNCTION: +ENGINE_load_nuron 2640 EXIST::FUNCTION: +ENGINE_load_atalla 2641 EXIST::FUNCTION: diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 46755fa287..2d92dc5f7d 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -68,7 +68,6 @@ and [options] can be one of debug - Debug build profile - Profiling build gcc - Use Gcc (unix) - rsaref - Build to require RSAref Values that can be set TMP=tmpdir OUT=outdir SRC=srcdir BIN=binpath INC=header-outdir CC=C-compiler @@ -218,7 +217,7 @@ $cflags.=" -DNO_SOCK" if $no_sock; $cflags.=" -DNO_SSL2" if $no_ssl2; $cflags.=" -DNO_SSL3" if $no_ssl3; $cflags.=" -DNO_ERR" if $no_err; -$cflags.=" -DRSAref" if $rsaref ne ""; +#$cflags.=" -DRSAref" if $rsaref ne ""; ## if ($unix) ## { $cflags="$c_flags" if ($c_flags ne ""); } @@ -885,7 +884,7 @@ sub read_options $no_md2=$no_sha=$no_mdc2=$no_dsa=$no_dh=1; $no_ssl2=$no_err=$no_rmd160=$no_rc5=1; } - elsif (/^rsaref$/) { $rsaref=1; } + elsif (/^rsaref$/) { } elsif (/^gcc$/) { $gcc=1; } elsif (/^debug$/) { $debug=1; } elsif (/^profile$/) { $profile=1; } diff --git a/util/mkdef.pl b/util/mkdef.pl index 6d0f2cdc02..f013c290e8 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -103,7 +103,7 @@ foreach (@ARGV, split(/ /, $options)) $NT = 1; } $VMS=1 if $_ eq "VMS"; - $rsaref=1 if $_ eq "rsaref"; + #$rsaref=1 if $_ eq "rsaref"; $do_ssl=1 if $_ eq "ssleay"; $do_ssl=1 if $_ eq "ssl"; @@ -147,7 +147,7 @@ if ($W16) { if (!$do_ssl && !$do_crypto) { - print STDERR "usage: $0 ( ssl | crypto ) [ 16 | 32 | NT ] [rsaref]\n"; + print STDERR "usage: $0 ( ssl | crypto ) [ 16 | 32 | NT ]\n"; exit(1); } diff --git a/util/mkerr.pl b/util/mkerr.pl index 7d98b5234d..407ca20313 100644 --- a/util/mkerr.pl +++ b/util/mkerr.pl @@ -38,7 +38,7 @@ while (@ARGV) { } if($recurse) { - @source = (, , , ); + @source = (, , ); } else { @source = @ARGV; } diff --git a/util/mkfiles.pl b/util/mkfiles.pl index 47bc934154..15e0120df3 100755 --- a/util/mkfiles.pl +++ b/util/mkfiles.pl @@ -48,7 +48,6 @@ my @dirs = ( "crypto/engine", "crypto/ocsp", "ssl", -"rsaref", "apps", "test", "tools" diff --git a/util/mkstack.pl b/util/mkstack.pl index 3ee13fe7c9..085c50f790 100755 --- a/util/mkstack.pl +++ b/util/mkstack.pl @@ -21,7 +21,7 @@ while (@ARGV) { } -@source = (, , , ); +@source = (, , ); foreach $file (@source) { next if -l $file; -- 2.25.1