diff options
| -rw-r--r-- | src/lib/libcrypto/Symbols.list | 1 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa.h | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_eay.c | 8 | 
3 files changed, 10 insertions, 3 deletions
| diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list index a9e97d7399..662eb4dc29 100644 --- a/src/lib/libcrypto/Symbols.list +++ b/src/lib/libcrypto/Symbols.list | |||
| @@ -2412,6 +2412,7 @@ RSAPublicKey_it | |||
| 2412 | RSA_OAEP_PARAMS_free | 2412 | RSA_OAEP_PARAMS_free | 
| 2413 | RSA_OAEP_PARAMS_it | 2413 | RSA_OAEP_PARAMS_it | 
| 2414 | RSA_OAEP_PARAMS_new | 2414 | RSA_OAEP_PARAMS_new | 
| 2415 | RSA_PKCS1_OpenSSL | ||
| 2415 | RSA_PKCS1_SSLeay | 2416 | RSA_PKCS1_SSLeay | 
| 2416 | RSA_PSS_PARAMS_free | 2417 | RSA_PSS_PARAMS_free | 
| 2417 | RSA_PSS_PARAMS_it | 2418 | RSA_PSS_PARAMS_it | 
| diff --git a/src/lib/libcrypto/rsa/rsa.h b/src/lib/libcrypto/rsa/rsa.h index 9dd840006f..9859c5f420 100644 --- a/src/lib/libcrypto/rsa/rsa.h +++ b/src/lib/libcrypto/rsa/rsa.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa.h,v 1.49 2019/11/02 13:47:41 jsing Exp $ */ | 1 | /* $OpenBSD: rsa.h,v 1.50 2019/11/02 13:52:31 jsing Exp $ */ | 
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 
| 3 | * All rights reserved. | 3 | * All rights reserved. | 
| 4 | * | 4 | * | 
| @@ -331,7 +331,7 @@ const RSA_METHOD *RSA_get_default_method(void); | |||
| 331 | const RSA_METHOD *RSA_get_method(const RSA *rsa); | 331 | const RSA_METHOD *RSA_get_method(const RSA *rsa); | 
| 332 | int RSA_set_method(RSA *rsa, const RSA_METHOD *meth); | 332 | int RSA_set_method(RSA *rsa, const RSA_METHOD *meth); | 
| 333 | 333 | ||
| 334 | /* these are the actual SSLeay RSA functions */ | 334 | const RSA_METHOD *RSA_PKCS1_OpenSSL(void); | 
| 335 | const RSA_METHOD *RSA_PKCS1_SSLeay(void); | 335 | const RSA_METHOD *RSA_PKCS1_SSLeay(void); | 
| 336 | 336 | ||
| 337 | const RSA_METHOD *RSA_null_method(void); | 337 | const RSA_METHOD *RSA_null_method(void); | 
| diff --git a/src/lib/libcrypto/rsa/rsa_eay.c b/src/lib/libcrypto/rsa/rsa_eay.c index 8e8c6d520d..33201a8a8b 100644 --- a/src/lib/libcrypto/rsa/rsa_eay.c +++ b/src/lib/libcrypto/rsa/rsa_eay.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_eay.c,v 1.50 2017/08/28 17:41:59 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_eay.c,v 1.51 2019/11/02 13:52:31 jsing Exp $ */ | 
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 
| 3 | * All rights reserved. | 3 | * All rights reserved. | 
| 4 | * | 4 | * | 
| @@ -145,6 +145,12 @@ static RSA_METHOD rsa_pkcs1_eay_meth = { | |||
| 145 | }; | 145 | }; | 
| 146 | 146 | ||
| 147 | const RSA_METHOD * | 147 | const RSA_METHOD * | 
| 148 | RSA_PKCS1_OpenSSL(void) | ||
| 149 | { | ||
| 150 | return &rsa_pkcs1_eay_meth; | ||
| 151 | } | ||
| 152 | |||
| 153 | const RSA_METHOD * | ||
| 148 | RSA_PKCS1_SSLeay(void) | 154 | RSA_PKCS1_SSLeay(void) | 
| 149 | { | 155 | { | 
| 150 | return &rsa_pkcs1_eay_meth; | 156 | return &rsa_pkcs1_eay_meth; | 
