diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-04-07 12:07:42 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-04-07 12:19:46 -0400 |
| commit | 076fc55527a1499391fa6de109c8387895199ee9 (patch) | |
| tree | 8a7d5eba7a2baf36080d6f4925dee48157a2e304 /include/openssl/rsa.h | |
| parent | 2f881d2d9065342454fe352eac9e835cefa0ba90 (diff) | |
| download | openssl-076fc55527a1499391fa6de109c8387895199ee9.zip openssl-076fc55527a1499391fa6de109c8387895199ee9.tar.gz openssl-076fc55527a1499391fa6de109c8387895199ee9.tar.bz2 | |
Make default_method mostly compile-time
Document thread-safety issues
Have RSA_null return NULL (always fails)
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2244)
Diffstat (limited to 'include/openssl/rsa.h')
| -rw-r--r-- | include/openssl/rsa.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h index 8ad4cda..f94ec5f 100644 --- a/include/openssl/rsa.h +++ b/include/openssl/rsa.h @@ -236,14 +236,13 @@ int RSA_flags(const RSA *r); void RSA_set_default_method(const RSA_METHOD *meth); const RSA_METHOD *RSA_get_default_method(void); +const RSA_METHOD *RSA_null_method(void); const RSA_METHOD *RSA_get_method(const RSA *rsa); int RSA_set_method(RSA *rsa, const RSA_METHOD *meth); /* these are the actual RSA functions */ const RSA_METHOD *RSA_PKCS1_OpenSSL(void); -const RSA_METHOD *RSA_null_method(void); - int RSA_pkey_ctx_ctrl(EVP_PKEY_CTX *ctx, int optype, int cmd, int p1, void *p2); DECLARE_ASN1_ENCODE_FUNCTIONS_const(RSA, RSAPublicKey) @@ -502,11 +501,11 @@ int ERR_load_RSA_strings(void); # define RSA_F_RSA_METH_SET1_NAME 163 # define RSA_F_RSA_MGF1_TO_MD 157 # define RSA_F_RSA_NEW_METHOD 106 -# define RSA_F_RSA_NULL 124 -# define RSA_F_RSA_NULL_PRIVATE_DECRYPT 132 -# define RSA_F_RSA_NULL_PRIVATE_ENCRYPT 133 -# define RSA_F_RSA_NULL_PUBLIC_DECRYPT 134 -# define RSA_F_RSA_NULL_PUBLIC_ENCRYPT 135 +# define RSA_F_RSA_NULL 0 +# define RSA_F_RSA_NULL_PRIVATE_DECRYPT 0 +# define RSA_F_RSA_NULL_PRIVATE_ENCRYPT 0 +# define RSA_F_RSA_NULL_PUBLIC_DECRYPT 0 +# define RSA_F_RSA_NULL_PUBLIC_ENCRYPT 0 # define RSA_F_RSA_OSSL_PRIVATE_DECRYPT 101 # define RSA_F_RSA_OSSL_PRIVATE_ENCRYPT 102 # define RSA_F_RSA_OSSL_PUBLIC_DECRYPT 103 |