Remove references to RSAref. The glue library is but a memory to fade

away now...

diff --git a/CHANGES b/CHANGES
index df8d4b19da6befc748212324ff60dcda17b3bbf4..518db59a6cb3607c96c5de2297f6d8b167496fb9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
  Changes between 0.9.6 and 0.9.7  [xx XXX 2000]
 
 
  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]
   *) 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 2215a3120a3ce4182e0c04c4481ae8b7ccc601cc..944ffe90b69b50601ada05f54d3182a51640f674 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -10,7 +10,7 @@ use strict;
 
 # see INSTALL for instructions.
 
 
 # see INSTALL for instructions.
 

-my $usage="Usage: Configure [no-<cipher> ...] [-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-<cipher> ...] [-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:
 #
 
 # Options:
 #


@@ -28,7 +28,6 @@ my $usage="Usage: Configure [no-<cipher> ...] [-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.
 #               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)
 # [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$/)
                        {
                        { $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 (/^[-+]/)
                        {
                        }
                elsif (/^[-+]/)
                        {

diff --git a/INSTALL b/INSTALL
index ea9b8a3844e19368c132fbd6b7f4a85d754ab1d4..ca4d403a3695a371616bc5d81395bed5f8941537 100644 (file)
--- 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.
 
   --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.
 
   no-threads    Don't try to build with support for multi-threaded
                 applications.
 

diff --git a/Makefile.org b/Makefile.org
index efd56d1fc581070acfaf18f9a891af19909cf8bc..38cbb1bc448e71cb4ee4442de057a241a6b12e77 100644 (file)
--- 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
 
 # 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
 # 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=
 
 # 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
 SHLIBDIRS= crypto ssl
 
 # dirs in crypto to build

diff --git a/TABLE b/TABLE
index 8482bda9531704128d18242a38268701add4de1a..6c24e757787c99019e5d9d11db91552a4fee8322 100644 (file)
--- a/TABLE
+++ b/TABLE
@@ -1160,7 +1160,7 @@ $cc           = cc
 $cflags       = -DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z
 $unistd       = 
 $thread_cflag = (unknown)
 $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      = 
 $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)
 $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      = 
 $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)
 $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      = 
 $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)
 $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      = 
 $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
 $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      = 
 $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 = 
 $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      = 
 $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
 $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      = 
 $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
 $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      = 
 $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
 $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      = 
 $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
 $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      = 
 $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
 $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      = 
 $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
 $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      = 
 $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 7e9d0ac8d6d02062b1f11c29fa05820e2daafb7a..e99dfa462545a63ca97b202c1f12fe738dd92d91 100644 (file)
--- a/apps/makeapps.com
+++ b/apps/makeapps.com
@@ -581,6 +581,7 @@ $ CHECK_OPTIONS:
 $!
 $! Check To See If P1 Is Blank.
 $!
 $!
 $! Check To See If P1 Is Blank.
 $!

+$ P1 = "NORSAREF"

 $ IF (P1.EQS."NORSAREF")
 $ THEN
 $!
 $ IF (P1.EQS."NORSAREF")
 $ THEN
 $!

diff --git a/apps/speed.c b/apps/speed.c
index 333dea6c92eabbdd8fd0d668bbcb28387e2b646e..92712cf464d7ca0ece247e350727a2c0be36c05d 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -547,7 +547,7 @@ int MAIN(int argc, char **argv)
                else
 #endif
 #ifndef NO_RSA
                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());
                        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 70e3c91b3449f550471a0f23e08a5e6154b24c1d..b58de8ea0f139cc1df6eeb147ddf5076f4e2c5c9 100644 (file)
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -896,6 +896,7 @@ $ ENDIF
 $!
 $! Check To See If P2 Is Blank.
 $!
 $!
 $! Check To See If P2 Is Blank.
 $!

+$ P2 = "NORSAREF"

 $ IF (P2.EQS."NORSAREF")
 $ THEN
 $!
 $ IF (P2.EQS."NORSAREF")
 $ THEN
 $!

diff --git a/crypto/engine/Makefile.ssl b/crypto/engine/Makefile.ssl
index 2823cd9583f437439f8ba8931e2d66ffc4b948bf..088e9da7792a0e488865ebe5d1aedf877c1c26ee 100644 (file)
--- 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.
 
 
 # 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
 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 b8315d8272303aa400978a3636f58379d4f7c29c..d4f169ec011d9963a993f6b03905535eba7501a4 100644 (file)
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -64,7 +64,7 @@
 #ifndef NO_RSA
 #include <openssl/rsa.h>
 #endif
 #ifndef NO_RSA
 #include <openssl/rsa.h>
 #endif

-#ifdef RSAref
+#if 0 /* was: #ifdef RSAref */

 #include <openssl/rsaref.h>
 #endif
 #ifndef NO_DH
 #include <openssl/rsaref.h>
 #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
        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();
        ERR_load_RSAREF_strings();
 #else
        ERR_load_RSA_strings();

diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec
index 9bd267bda210f2f930d539969ae183fa9313d083..717c6eeba178dcde1afbcf498eddc4973ca41bc2 100644 (file)
--- 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 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
 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 4fee3d964964eff70877722ca66d30fdcca92229..4cde842c3516e6d6ba5fa70beed8cd526730de5a 100644 (file)
--- 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 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();
                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 02edb7aa756f882d160982010df0eda81482d98d..e20dfcb5515bcc042c668895986ed82ce8458d6c 100644 (file)
--- a/doc/crypto/RSA_public_encrypt.pod
+++ b/doc/crypto/RSA_public_encrypt.pod
@@ -74,10 +74,6 @@ SSL, PKCS #1 v2.0
 
 L<err(3)|err(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_size(3)|RSA_size(3)>
 
 
 L<err(3)|err(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_size(3)|RSA_size(3)>
 

-=head1 NOTES
-
-The L<RSA_PKCS1_RSAref(3)|RSA_PKCS1_RSAref(3)> method supports only the RSA_PKCS1_PADDING mode.
-

 =head1 HISTORY
 
 The B<padding> argument was added in SSLeay 0.8. RSA_NO_PADDING is
 =head1 HISTORY
 
 The B<padding> 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 46655d3bd653cd4253e7373d53e16cc4113ad88f..14917dd35f9149c76e459542125ca1616747f0ba 100644 (file)
--- 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,
 =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
 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_SSLeay(void);
 

- RSA_METHOD *RSA_PKCS1_RSAref(void);
-

  RSA_METHOD *RSA_null_method(void);
 
  int RSA_flags(RSA *rsa);
  RSA_METHOD *RSA_null_method(void);
 
  int RSA_flags(RSA *rsa);


@@ -35,17 +33,8 @@ An B<RSA_METHOD> specifies the functions that OpenSSL uses for RSA
 operations. By modifying the method, alternative implementations
 such as hardware accelerators may be used.
 
 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<rsaref> 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<rsaref> 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<meth> the default method for all B<RSA>
 structures created later. B<NB:> This is true only whilst the default engine
 
 RSA_set_default_openssl_method() makes B<meth> the default method for all B<RSA>
 structures created later. B<NB:> This is true only whilst the default engine


@@ -132,9 +121,8 @@ the default engine for RSA operations is used.
 
 =head1 RETURN VALUES
 
 
 =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.
 
 
 RSA_set_default_openssl_method() returns no value.
 

diff --git a/doc/crypto/rsa.pod b/doc/crypto/rsa.pod
index ef0d4df2054a58b6a5e2081ca4739616e76f069c..09ad30cab1566645eb81ab44574ee7f265f72712 100644 (file)
--- 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);
  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);
  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 15cbc9ce9d77b2ece1c361cefd0d7e8a26354530..219c5aef179aa78023d1c443b49ae0a6c849049e 100755 (executable)
--- a/makevms.com
+++ b/makevms.com
@@ -425,8 +425,8 @@ $ LOOP_SDIRS_END:
 $!
 $! Copy All The ".H" Files From The [.RSAREF] Directory.
 $!
 $!
 $! 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.
 $!
 $!
 $! Copy All The ".H" Files From The [.SSL] Directory.
 $!


@@ -473,6 +473,9 @@ $!
 $! Build The [.xxx.EXE.RSAREF]LIBRSAGLUE Library.
 $!
 $ RSAREF:
 $! 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.
 $!
 $!
 $! 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 "    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."
 $     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.
 $!
 $!
 $! Check To See If P2 Is Blank.
 $!

+$ P2 = "NORSAREF"

 $ IF (P2.EQS."NORSAREF")
 $ THEN
 $!
 $ IF (P2.EQS."NORSAREF")
 $ THEN
 $!

diff --git a/openssl.spec b/openssl.spec
index 0f2856bb1704b70b3e4f6854422b336764b90b28..501151ab47394ad51727bfbe8f86d97bd8e735ac 100644 (file)
--- 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
 
        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
 
 # 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 0a8581898cbb13cb9fed8e284adf7278eeeae14e..05c458d191eff90bba2299f7afa8e3d97cc2632c 100644 (file)
--- a/ssl/ssl-lib.com
+++ b/ssl/ssl-lib.com
@@ -647,6 +647,7 @@ $ ENDIF
 $!
 $! Check To See If P2 Is Blank.
 $!
 $!
 $! Check To See If P2 Is Blank.
 $!

+$ p2 = "NORSAREF"

 $ IF (P2.EQS."NORSAREF")
 $ THEN
 $!
 $ IF (P2.EQS."NORSAREF")
 $ THEN
 $!

diff --git a/test/maketests.com b/test/maketests.com
index 3eba56eb1ef4514049b90a5afe764cf6a3cd246a..0f6d90fae8625493487be803c346eb406036500c 100644 (file)
--- a/test/maketests.com
+++ b/test/maketests.com
@@ -514,6 +514,7 @@ $ CHECK_OPTIONS:
 $!
 $! Check To See If P1 Is Blank.
 $!
 $!
 $! Check To See If P1 Is Blank.
 $!

+$ P1 = "NORSAREF"

 $ IF (P1.EQS."NORSAREF")
 $ THEN
 $!
 $ IF (P1.EQS."NORSAREF")
 $ THEN
 $!

diff --git a/util/libeay.num b/util/libeay.num
index 959bf80fd2bbebcddf41c033bad09e565d003b47..1c845a6feee04ceb4abb476aff028447bbff3b26 100755 (executable)
--- 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:
 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 46755fa28705c6a1cba1939bb302401e9cce4246..2d92dc5f7d09de4e22bb55d8d7bdbb38e9bcf3eb 100755 (executable)
--- 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)
        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
 
 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.=" -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 ""); }
 
 ## 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; }
 
                                  $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; }
        elsif (/^gcc$/)         { $gcc=1; }
        elsif (/^debug$/)       { $debug=1; }
        elsif (/^profile$/)     { $profile=1; }

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 6d0f2cdc024570a319e2f43a0d0ac25caaa4591d..f013c290e8e503d41ba75cc2af8ba5af162c5e23 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -103,7 +103,7 @@ foreach (@ARGV, split(/ /, $options))
                $NT = 1;
        }
        $VMS=1 if $_ eq "VMS";
                $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";
 
        $do_ssl=1 if $_ eq "ssleay";
        $do_ssl=1 if $_ eq "ssl";


@@ -147,7 +147,7 @@ if ($W16) {
 
 if (!$do_ssl && !$do_crypto)
        {
 
 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);
        }
 
        exit(1);
        }
 

diff --git a/util/mkerr.pl b/util/mkerr.pl
index 7d98b5234d91026c31cbebc9e784ceaeec5f8c3a..407ca2031372549b39ca345003f2877c57fcc014 100644 (file)
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -38,7 +38,7 @@ while (@ARGV) {
 }
 
 if($recurse) {
 }
 
 if($recurse) {

-       @source = (<crypto/*.c>, <crypto/*/*.c>, <rsaref/*.c>, <ssl/*.c>);
+       @source = (<crypto/*.c>, <crypto/*/*.c>, <ssl/*.c>);

 } else {
        @source = @ARGV;
 }
 } else {
        @source = @ARGV;
 }

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 47bc934154c77fb5312195383e9f2972e92d9012..15e0120df3a456ba32b54dea678f11537a328d5b 100755 (executable)
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -48,7 +48,6 @@ my @dirs = (
 "crypto/engine",
 "crypto/ocsp",
 "ssl",
 "crypto/engine",
 "crypto/ocsp",
 "ssl",

-"rsaref",

 "apps",
 "test",
 "tools"
 "apps",
 "test",
 "tools"

diff --git a/util/mkstack.pl b/util/mkstack.pl
index 3ee13fe7c9da56e86ed3100538d24909e26443ed..085c50f790f202d62cc15dd57032d093f81479d5 100755 (executable)
--- a/util/mkstack.pl
+++ b/util/mkstack.pl
@@ -21,7 +21,7 @@ while (@ARGV) {
 }
 
 
 }
 
 

-@source = (<crypto/*.[ch]>, <crypto/*/*.[ch]>, <rsaref/*.[ch]>, <ssl/*.[ch]>);
+@source = (<crypto/*.[ch]>, <crypto/*/*.[ch]>, <ssl/*.[ch]>);

 foreach $file (@source) {
        next if -l $file;
 
 foreach $file (@source) {
        next if -l $file;