Skip to content

T
Third Party Openssl

OpenHarmony / Third Party Openssl
9 个月 前同步成功

通知 8
Star 18
Fork 1
T
Third Party Openssl

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 ccb9643f 编写于 作者: R Richard Levitte
浏览文件
操作

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

away now...
上级 7f7b8d68
隐藏空白更改
内联 并排
Showing with 74 addition and 63 deletion
CHANGES
浏览文件 @ ccb9643f
...@@ -4,6 +4,9 @@ ...@@ -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. *) 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(). The previous value, 12, was not always sufficient for BN_mod_exp().
[Bodo Moeller] [Bodo Moeller]
......
Configure
浏览文件 @ ccb9643f
...@@ -10,7 +10,7 @@ use strict; ...@@ -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] [- ...@@ -28,7 +28,6 @@ my $usage="Usage: Configure [no-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-
# are always compiled but return NULL if the hardware # are always compiled but return NULL if the hardware
# support isn't compiled. # support isn't compiled.
# no-hw do not compile support for any crypto hardware. # 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 # [no-]threads [don't] try to create a library that is suitable for
# multithreaded applications (default is "threads" if we # multithreaded applications (default is "threads" if we
# know how to do it) # know how to do it)
...@@ -564,9 +563,9 @@ PROCESS_ARGS: ...@@ -564,9 +563,9 @@ PROCESS_ARGS:
{ $processor=386; } { $processor=386; }
elsif (/^rsaref$/) elsif (/^rsaref$/)
{ {
$libs.= "-lRSAglue -lrsaref "; # No RSAref support any more since it's not needed.
$flags.= "-DRSAref "; # The check for the option is there so scripts aren't
$openssl_other_defines .= "#define RSAref\n"; # broken
} }
elsif (/^[-+]/) elsif (/^[-+]/)
{ {
......
INSTALL
浏览文件 @ ccb9643f
...@@ -43,9 +43,6 @@ ...@@ -43,9 +43,6 @@
--openssldir=DIR Directory for OpenSSL files. If no prefix is specified, --openssldir=DIR Directory for OpenSSL files. If no prefix is specified,
the library files and binaries are also installed there. 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 no-threads Don't try to build with support for multi-threaded
applications. applications.
......
Makefile.org
浏览文件 @ ccb9643f
...@@ -24,7 +24,6 @@ INSTALLTOP=/usr/local/ssl ...@@ -24,7 +24,6 @@ INSTALLTOP=/usr/local/ssl
# Do not edit this manually. Use Configure --openssldir=DIR do change this! # Do not edit this manually. Use Configure --openssldir=DIR do change this!
OPENSSLDIR=/usr/local/ssl OPENSSLDIR=/usr/local/ssl
# RSAref - Define if we are to link with RSAref.
# NO_IDEA - Define to build without the IDEA algorithm # NO_IDEA - Define to build without the IDEA algorithm
# NO_RC4 - Define to build without the RC4 algorithm # NO_RC4 - Define to build without the RC4 algorithm
# NO_RC2 - Define to build without the RC2 algorithm # NO_RC2 - Define to build without the RC2 algorithm
...@@ -154,7 +153,7 @@ RMD160_ASM_OBJ= asm/rm86-out.o ...@@ -154,7 +153,7 @@ RMD160_ASM_OBJ= asm/rm86-out.o
# we might set SHLIB_MARK to '$(SHARED_LIBS)'. # we might set SHLIB_MARK to '$(SHARED_LIBS)'.
SHLIB_MARK= SHLIB_MARK=
DIRS= crypto ssl rsaref $(SHLIB_MARK) apps test tools DIRS= crypto ssl $(SHLIB_MARK) apps test tools
SHLIBDIRS= crypto ssl SHLIBDIRS= crypto ssl
# dirs in crypto to build # dirs in crypto to build
......
TABLE
浏览文件 @ ccb9643f
...@@ -1160,7 +1160,7 @@ $cc = cc ...@@ -1160,7 +1160,7 @@ $cc = cc
$cflags = -DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z $cflags = -DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z
$unistd = $unistd =
$thread_cflag = (unknown) $thread_cflag = (unknown)
$lflags = -ldld $lflags = -Wl,+s -ldld
$bn_ops = DES_PTR DES_UNROLL DES_RISC1 $bn_ops = DES_PTR DES_UNROLL DES_RISC1
$bn_obj = $bn_obj =
$des_obj = $des_obj =
...@@ -1181,7 +1181,7 @@ $cc = gcc ...@@ -1181,7 +1181,7 @@ $cc = gcc
$cflags = -DB_ENDIAN -DBN_DIV2W -O3 $cflags = -DB_ENDIAN -DBN_DIV2W -O3
$unistd = $unistd =
$thread_cflag = (unknown) $thread_cflag = (unknown)
$lflags = -ldld $lflags = -Wl,+s -ldld
$bn_ops = DES_PTR DES_UNROLL DES_RISC1 $bn_ops = DES_PTR DES_UNROLL DES_RISC1
$bn_obj = $bn_obj =
$des_obj = $des_obj =
...@@ -1202,7 +1202,7 @@ $cc = cc ...@@ -1202,7 +1202,7 @@ $cc = cc
$cflags = -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3 -z $cflags = -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3 -z
$unistd = $unistd =
$thread_cflag = (unknown) $thread_cflag = (unknown)
$lflags = -ldld $lflags = -Wl,+s -ldld
$bn_ops = BN_LLONG DES_PTR DES_UNROLL DES_RISC1 $bn_ops = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
$bn_obj = $bn_obj =
$des_obj = $des_obj =
...@@ -1223,7 +1223,7 @@ $cc = gcc ...@@ -1223,7 +1223,7 @@ $cc = gcc
$cflags = -DB_ENDIAN -DBN_DIV2W -O3 $cflags = -DB_ENDIAN -DBN_DIV2W -O3
$unistd = $unistd =
$thread_cflag = (unknown) $thread_cflag = (unknown)
$lflags = -ldld $lflags = -Wl,+s -ldld
$bn_ops = BN_LLONG DES_PTR DES_UNROLL DES_RISC1 $bn_ops = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
$bn_obj = $bn_obj =
$des_obj = $des_obj =
...@@ -1244,7 +1244,7 @@ $cc = cc ...@@ -1244,7 +1244,7 @@ $cc = cc
$cflags = +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY $cflags = +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY
$unistd = $unistd =
$thread_cflag = -D_REENTRANT $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_ops = MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
$bn_obj = $bn_obj =
$des_obj = $des_obj =
...@@ -1286,7 +1286,7 @@ $cc = gcc ...@@ -1286,7 +1286,7 @@ $cc = gcc
$cflags = -O3 -DB_ENDIAN -DBN_DIV2W $cflags = -O3 -DB_ENDIAN -DBN_DIV2W
$unistd = $unistd =
$thread_cflag = $thread_cflag =
$lflags = -ldld $lflags = -Wl,+s -ldld
$bn_ops = BN_LLONG DES_PTR DES_UNROLL DES_RISC1 $bn_ops = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
$bn_obj = $bn_obj =
$des_obj = $des_obj =
...@@ -1307,7 +1307,7 @@ $cc = cc ...@@ -1307,7 +1307,7 @@ $cc = cc
$cflags = +DA1.1 +DS1.1 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY $cflags = +DA1.1 +DS1.1 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY
$unistd = $unistd =
$thread_cflag = -D_REENTRANT $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_ops = MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
$bn_obj = $bn_obj =
$des_obj = $des_obj =
...@@ -1328,7 +1328,7 @@ $cc = cc ...@@ -1328,7 +1328,7 @@ $cc = cc
$cflags = +DA2.0 +DS2.0 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY $cflags = +DA2.0 +DS2.0 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY
$unistd = $unistd =
$thread_cflag = -D_REENTRANT $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_ops = SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT
$bn_obj = asm/pa-risc2.o $bn_obj = asm/pa-risc2.o
$des_obj = $des_obj =
...@@ -1349,7 +1349,7 @@ $cc = cc ...@@ -1349,7 +1349,7 @@ $cc = cc
$cflags = -DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z $cflags = -DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z
$unistd = $unistd =
$thread_cflag = -D_REENTRANT $thread_cflag = -D_REENTRANT
$lflags = -ldld $lflags = -Wl,+s -ldld
$bn_ops = BN_LLONG DES_PTR DES_UNROLL DES_RISC1 $bn_ops = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
$bn_obj = $bn_obj =
$des_obj = $des_obj =
...@@ -1370,7 +1370,7 @@ $cc = gcc ...@@ -1370,7 +1370,7 @@ $cc = gcc
$cflags = -DB_ENDIAN -DBN_DIV2W -O3 $cflags = -DB_ENDIAN -DBN_DIV2W -O3
$unistd = $unistd =
$thread_cflag = -D_REENTRANT $thread_cflag = -D_REENTRANT
$lflags = -ldld $lflags = -Wl,+s -ldld
$bn_ops = DES_PTR DES_UNROLL DES_RISC1 $bn_ops = DES_PTR DES_UNROLL DES_RISC1
$bn_obj = $bn_obj =
$des_obj = $des_obj =
...@@ -1391,7 +1391,7 @@ $cc = cc ...@@ -1391,7 +1391,7 @@ $cc = cc
$cflags = -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3 -z $cflags = -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3 -z
$unistd = $unistd =
$thread_cflag = -D_REENTRANT $thread_cflag = -D_REENTRANT
$lflags = -ldld $lflags = -Wl,+s -ldld
$bn_ops = BN_LLONG DES_PTR DES_UNROLL DES_RISC1 $bn_ops = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
$bn_obj = $bn_obj =
$des_obj = $des_obj =
...@@ -1412,7 +1412,7 @@ $cc = gcc ...@@ -1412,7 +1412,7 @@ $cc = gcc
$cflags = -DB_ENDIAN -DBN_DIV2W -O3 $cflags = -DB_ENDIAN -DBN_DIV2W -O3
$unistd = $unistd =
$thread_cflag = -D_REENTRANT $thread_cflag = -D_REENTRANT
$lflags = -ldld $lflags = -Wl,+s -ldld
$bn_ops = BN_LLONG DES_PTR DES_UNROLL DES_RISC1 $bn_ops = BN_LLONG DES_PTR DES_UNROLL DES_RISC1
$bn_obj = $bn_obj =
$des_obj = $des_obj =
......
apps/makeapps.com
浏览文件 @ ccb9643f
...@@ -581,6 +581,7 @@ $ CHECK_OPTIONS: ...@@ -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") $ IF (P1.EQS."NORSAREF")
$ THEN $ THEN
$! $!
......
apps/speed.c
浏览文件 @ ccb9643f
...@@ -547,7 +547,7 @@ int MAIN(int argc, char **argv) ...@@ -547,7 +547,7 @@ int MAIN(int argc, char **argv)
else else
#endif #endif
#ifndef NO_RSA #ifndef NO_RSA
#ifdef RSAref #if 0 /* was: #ifdef RSAref */
if (strcmp(*argv,"rsaref") == 0) if (strcmp(*argv,"rsaref") == 0)
{ {
RSA_set_default_openssl_method(RSA_PKCS1_RSAref()); RSA_set_default_openssl_method(RSA_PKCS1_RSAref());
......
crypto/crypto-lib.com
浏览文件 @ ccb9643f
...@@ -896,6 +896,7 @@ $ ENDIF ...@@ -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") $ IF (P2.EQS."NORSAREF")
$ THEN $ THEN
$! $!
......
crypto/engine/Makefile.ssl
浏览文件 @ ccb9643f
...@@ -80,6 +80,26 @@ clean: ...@@ -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/asn1.h ../../include/openssl/bio.h
engine_err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.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/cast.h ../../include/openssl/crypto.h
......
crypto/err/err_all.c
浏览文件 @ ccb9643f
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
#ifndef NO_RSA #ifndef NO_RSA
#include <openssl/rsa.h> #include <openssl/rsa.h>
#endif #endif
#ifdef RSAref #if 0 /* was: #ifdef RSAref */
#include <openssl/rsaref.h> #include <openssl/rsaref.h>
#endif #endif
#ifndef NO_DH #ifndef NO_DH
...@@ -98,7 +98,7 @@ void ERR_load_crypto_strings(void) ...@@ -98,7 +98,7 @@ void ERR_load_crypto_strings(void)
ERR_load_BIO_strings(); ERR_load_BIO_strings();
ERR_load_CONF_strings(); ERR_load_CONF_strings();
#ifndef NO_RSA #ifndef NO_RSA
#ifdef RSAref #if 0 /* was: #ifdef RSAref */
ERR_load_RSAREF_strings(); ERR_load_RSAREF_strings();
#else #else
ERR_load_RSA_strings(); ERR_load_RSA_strings();
......
crypto/err/openssl.ec
浏览文件 @ ccb9643f
...@@ -20,7 +20,6 @@ L CONF crypto/conf/conf.h crypto/conf/conf_err.c ...@@ -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 PROXY crypto/proxy/proxy.h crypto/proxy/proxy_err.c
L PKCS7 crypto/pkcs7/pkcs7.h crypto/pkcs7/pkcs7err.c L PKCS7 crypto/pkcs7/pkcs7.h crypto/pkcs7/pkcs7err.c
L PKCS12 crypto/pkcs12/pkcs12.h crypto/pkcs12/pk12err.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 SSL ssl/ssl.h ssl/ssl_err.c
L COMP crypto/comp/comp.h crypto/comp/comp_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 RAND crypto/rand/rand.h crypto/rand/rand_err.c
......
crypto/rsa/rsa_lib.c
浏览文件 @ ccb9643f
...@@ -101,7 +101,7 @@ const RSA_METHOD *RSA_get_default_openssl_method(void) ...@@ -101,7 +101,7 @@ const RSA_METHOD *RSA_get_default_openssl_method(void)
#ifdef RSA_NULL #ifdef RSA_NULL
default_RSA_meth=RSA_null_method(); default_RSA_meth=RSA_null_method();
#else #else
#ifdef RSAref #if 0 /* was: #ifdef RSAref
default_RSA_meth=RSA_PKCS1_RSAref(); default_RSA_meth=RSA_PKCS1_RSAref();
#else #else
default_RSA_meth=RSA_PKCS1_SSLeay(); default_RSA_meth=RSA_PKCS1_SSLeay();
......
doc/crypto/RSA_public_encrypt.pod
浏览文件 @ ccb9643f
...@@ -74,10 +74,6 @@ SSL, PKCS #1 v2.0 ...@@ -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 =head1 HISTORY
The B<padding> argument was added in SSLeay 0.8. RSA_NO_PADDING is The B<padding> argument was added in SSLeay 0.8. RSA_NO_PADDING is
......
doc/crypto/RSA_set_method.pod
浏览文件 @ ccb9643f
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
=head1 NAME =head1 NAME
RSA_set_default_method, RSA_get_default_method, RSA_set_method, 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 RSA_null_method, RSA_flags, RSA_new_method - select RSA method
=head1 SYNOPSIS =head1 SYNOPSIS
...@@ -21,8 +21,6 @@ RSA_null_method, RSA_flags, RSA_new_method - select RSA method ...@@ -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); RSA_METHOD *RSA_null_method(void);
int RSA_flags(RSA *rsa); int RSA_flags(RSA *rsa);
...@@ -35,17 +33,8 @@ An B<RSA_METHOD> specifies the functions that OpenSSL uses for RSA ...@@ -35,17 +33,8 @@ An B<RSA_METHOD> specifies the functions that OpenSSL uses for RSA
operations. By modifying the method, alternative implementations operations. By modifying the method, alternative implementations
such as hardware accelerators may be used. such as hardware accelerators may be used.
Initially, the default is to use the OpenSSL internal implementation, Initially, the default is to use the OpenSSL internal implementation.
unless OpenSSL was configured with the C<rsaref> or C<-DRSA_NULL> RSA_PKCS1_SSLeay() returns a pointer to that method.
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.
RSA_set_default_openssl_method() makes B<meth> the default method for all B<RSA> 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 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. ...@@ -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_PKCS1_SSLeay(), RSA_PKCS1_null_method(), RSA_get_default_openssl_method()
RSA_get_default_openssl_method() and RSA_get_method() return pointers to and RSA_get_method() return pointers to the respective RSA_METHODs.
the respective RSA_METHODs.
RSA_set_default_openssl_method() returns no value. RSA_set_default_openssl_method() returns no value.
......
doc/crypto/rsa.pod
浏览文件 @ ccb9643f
...@@ -37,7 +37,6 @@ rsa - RSA public key cryptosystem ...@@ -37,7 +37,6 @@ rsa - RSA public key cryptosystem
int RSA_set_method(RSA *rsa, ENGINE *engine); int RSA_set_method(RSA *rsa, ENGINE *engine);
RSA_METHOD *RSA_get_method(RSA *rsa); RSA_METHOD *RSA_get_method(RSA *rsa);
RSA_METHOD *RSA_PKCS1_SSLeay(void); RSA_METHOD *RSA_PKCS1_SSLeay(void);
RSA_METHOD *RSA_PKCS1_RSAref(void);
RSA_METHOD *RSA_null_method(void); RSA_METHOD *RSA_null_method(void);
int RSA_flags(RSA *rsa); int RSA_flags(RSA *rsa);
RSA *RSA_new_method(ENGINE *engine); RSA *RSA_new_method(ENGINE *engine);
......
makevms.com
浏览文件 @ ccb9643f
...@@ -425,8 +425,8 @@ $ LOOP_SDIRS_END: ...@@ -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 $! EXHEADER := rsaref.h
$ COPY SYS$DISK:[.RSAREF]'EXHEADER' SYS$DISK:[.INCLUDE.OPENSSL] $! 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 @@ $! ...@@ -473,6 +473,9 @@ $!
$! Build The [.xxx.EXE.RSAREF]LIBRSAGLUE Library. $! Build The [.xxx.EXE.RSAREF]LIBRSAGLUE Library.
$! $!
$ RSAREF: $ 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 ...@@ -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 " BUILDINF : Just build the [.CRYPTO]BUILDINF.H file."
$ WRITE SYS$OUTPUT " SOFTLINKS: Just Fix The Unix soft links." $ 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 " 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 : 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 " CRYPTO/x : To Build Just The x Part Of The"
$ WRITE SYS$OUTPUT " [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library." $ WRITE SYS$OUTPUT " [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library."
...@@ -677,6 +679,7 @@ $ ENDIF ...@@ -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") $ IF (P2.EQS."NORSAREF")
$ THEN $ THEN
$! $!
......
openssl.spec
浏览文件 @ ccb9643f
...@@ -109,9 +109,9 @@ for x in $RPM_BUILD_ROOT/usr/man/man*/* ...@@ -109,9 +109,9 @@ for x in $RPM_BUILD_ROOT/usr/man/man*/*
do mv ${x} ${x}ssl do mv ${x} ${x}ssl
done done
# Install RSAref stuff ## Install RSAref stuff
install -m644 rsaref/rsaref.h $RPM_BUILD_ROOT/usr/include/openssl #install -m644 rsaref/rsaref.h $RPM_BUILD_ROOT/usr/include/openssl
install -m644 libRSAglue.a $RPM_BUILD_ROOT/usr/lib #install -m644 libRSAglue.a $RPM_BUILD_ROOT/usr/lib
# Make backwards-compatibility symlink to ssleay # Make backwards-compatibility symlink to ssleay
ln -sf /usr/bin/openssl $RPM_BUILD_ROOT/usr/bin/ssleay ln -sf /usr/bin/openssl $RPM_BUILD_ROOT/usr/bin/ssleay
......
ssl/ssl-lib.com
浏览文件 @ ccb9643f
...@@ -647,6 +647,7 @@ $ ENDIF ...@@ -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") $ IF (P2.EQS."NORSAREF")
$ THEN $ THEN
$! $!
......
test/maketests.com
浏览文件 @ ccb9643f
...@@ -514,6 +514,7 @@ $ CHECK_OPTIONS: ...@@ -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") $ IF (P1.EQS."NORSAREF")
$ THEN $ THEN
$! $!
......
util/libeay.num
浏览文件 @ ccb9643f
...@@ -2044,3 +2044,9 @@ d2i_OCSP_SIGNATURE 2632 EXIST::FUNCTION: ...@@ -2044,3 +2044,9 @@ d2i_OCSP_SIGNATURE 2632 EXIST::FUNCTION:
X509_ocspid_print 2633 EXIST::FUNCTION: X509_ocspid_print 2633 EXIST::FUNCTION:
OCSP_request_verify 2634 EXIST::FUNCTION: OCSP_request_verify 2634 EXIST::FUNCTION:
i2d_OCSP_REQUEST 2635 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:
util/mk1mf.pl
浏览文件 @ ccb9643f
...@@ -68,7 +68,6 @@ and [options] can be one of ...@@ -68,7 +68,6 @@ and [options] can be one of
debug - Debug build debug - Debug build
profile - Profiling build profile - Profiling build
gcc - Use Gcc (unix) gcc - Use Gcc (unix)
rsaref - Build to require RSAref
Values that can be set Values that can be set
TMP=tmpdir OUT=outdir SRC=srcdir BIN=binpath INC=header-outdir CC=C-compiler TMP=tmpdir OUT=outdir SRC=srcdir BIN=binpath INC=header-outdir CC=C-compiler
...@@ -218,7 +217,7 @@ $cflags.=" -DNO_SOCK" if $no_sock; ...@@ -218,7 +217,7 @@ $cflags.=" -DNO_SOCK" if $no_sock;
$cflags.=" -DNO_SSL2" if $no_ssl2; $cflags.=" -DNO_SSL2" if $no_ssl2;
$cflags.=" -DNO_SSL3" if $no_ssl3; $cflags.=" -DNO_SSL3" if $no_ssl3;
$cflags.=" -DNO_ERR" if $no_err; $cflags.=" -DNO_ERR" if $no_err;
$cflags.=" -DRSAref" if $rsaref ne ""; #$cflags.=" -DRSAref" if $rsaref ne "";
## if ($unix) ## if ($unix)
## { $cflags="$c_flags" if ($c_flags ne ""); } ## { $cflags="$c_flags" if ($c_flags ne ""); }
...@@ -885,7 +884,7 @@ sub read_options ...@@ -885,7 +884,7 @@ sub read_options
$no_md2=$no_sha=$no_mdc2=$no_dsa=$no_dh=1; $no_md2=$no_sha=$no_mdc2=$no_dsa=$no_dh=1;
$no_ssl2=$no_err=$no_rmd160=$no_rc5=1; } $no_ssl2=$no_err=$no_rmd160=$no_rc5=1; }
elsif (/^rsaref$/) { $rsaref=1; } elsif (/^rsaref$/) { }
elsif (/^gcc$/) { $gcc=1; } elsif (/^gcc$/) { $gcc=1; }
elsif (/^debug$/) { $debug=1; } elsif (/^debug$/) { $debug=1; }
elsif (/^profile$/) { $profile=1; } elsif (/^profile$/) { $profile=1; }
......
util/mkdef.pl
浏览文件 @ ccb9643f
...@@ -103,7 +103,7 @@ foreach (@ARGV, split(/ /, $options)) ...@@ -103,7 +103,7 @@ foreach (@ARGV, split(/ /, $options))
$NT = 1; $NT = 1;
} }
$VMS=1 if $_ eq "VMS"; $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 "ssleay";
$do_ssl=1 if $_ eq "ssl"; $do_ssl=1 if $_ eq "ssl";
...@@ -147,7 +147,7 @@ if ($W16) { ...@@ -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);
} }
......
util/mkerr.pl
浏览文件 @ ccb9643f
...@@ -38,7 +38,7 @@ while (@ARGV) { ...@@ -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 { } else {
@source = @ARGV; @source = @ARGV;
} }
......
util/mkfiles.pl
浏览文件 @ ccb9643f
...@@ -48,7 +48,6 @@ my @dirs = ( ...@@ -48,7 +48,6 @@ my @dirs = (
"crypto/engine", "crypto/engine",
"crypto/ocsp", "crypto/ocsp",
"ssl", "ssl",
"rsaref",
"apps", "apps",
"test", "test",
"tools" "tools"
......
util/mkstack.pl
浏览文件 @ ccb9643f
...@@ -21,7 +21,7 @@ while (@ARGV) { ...@@ -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) { foreach $file (@source) {
next if -l $file; next if -l $file;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或