diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2019-11-02 13:47:42 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2019-11-02 13:47:42 +0000 |
| commit | 222b4dff7ea867f8a2b0bda9b7ededa7922caa69 (patch) | |
| tree | 7aac159d8bf47d3d5b293c309b958c2e8ee17670 /lib/libcrypto | |
| parent | bb3dcde857f9fe0c3d7b75b85ef7b175b7e775d7 (diff) | |
Make RSA_padding_{add,check}_PKCS1_OAEP_mgf1() public.
Diffstat (limited to 'lib/libcrypto')
| -rw-r--r-- | lib/libcrypto/Symbols.list | 2 | ||||
| -rw-r--r-- | lib/libcrypto/rsa/rsa.h | 8 | ||||
| -rw-r--r-- | lib/libcrypto/rsa/rsa_locl.h | 9 |
3 files changed, 10 insertions, 9 deletions
diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list index ea6913d8f66..a9e97d7399e 100644 --- a/lib/libcrypto/Symbols.list +++ b/lib/libcrypto/Symbols.list @@ -2467,6 +2467,7 @@ RSA_meth_set_verify RSA_new RSA_new_method RSA_padding_add_PKCS1_OAEP +RSA_padding_add_PKCS1_OAEP_mgf1 RSA_padding_add_PKCS1_PSS RSA_padding_add_PKCS1_PSS_mgf1 RSA_padding_add_PKCS1_type_1 @@ -2474,6 +2475,7 @@ RSA_padding_add_PKCS1_type_2 RSA_padding_add_X931 RSA_padding_add_none RSA_padding_check_PKCS1_OAEP +RSA_padding_check_PKCS1_OAEP_mgf1 RSA_padding_check_PKCS1_type_1 RSA_padding_check_PKCS1_type_2 RSA_padding_check_X931 diff --git a/lib/libcrypto/rsa/rsa.h b/lib/libcrypto/rsa/rsa.h index 0c6f5b920d1..9dd840006f2 100644 --- a/lib/libcrypto/rsa/rsa.h +++ b/lib/libcrypto/rsa/rsa.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa.h,v 1.48 2019/11/02 13:44:19 jsing Exp $ */ +/* $OpenBSD: rsa.h,v 1.49 2019/11/02 13:47:41 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -430,6 +430,12 @@ int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen, int RSA_padding_check_PKCS1_OAEP(unsigned char *to, int tlen, const unsigned char *f, int fl, int rsa_len, const unsigned char *p, int pl); +int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen, + const unsigned char *from, int flen, const unsigned char *param, int plen, + const EVP_MD *md, const EVP_MD *mgf1md); +int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen, + const unsigned char *from, int flen, int num, const unsigned char *param, + int plen, const EVP_MD *md, const EVP_MD *mgf1md); int RSA_padding_add_none(unsigned char *to, int tlen, const unsigned char *f, int fl); int RSA_padding_check_none(unsigned char *to, int tlen, diff --git a/lib/libcrypto/rsa/rsa_locl.h b/lib/libcrypto/rsa/rsa_locl.h index ef4dddd16b9..7036449c363 100644 --- a/lib/libcrypto/rsa/rsa_locl.h +++ b/lib/libcrypto/rsa/rsa_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_locl.h,v 1.10 2019/11/02 13:44:19 jsing Exp $ */ +/* $OpenBSD: rsa_locl.h,v 1.11 2019/11/02 13:47:41 jsing Exp $ */ __BEGIN_HIDDEN_DECLS @@ -17,11 +17,4 @@ extern int int_rsa_verify(int dtype, const unsigned char *m, unsigned int m_len, unsigned char *rm, size_t *prm_len, const unsigned char *sigbuf, size_t siglen, RSA *rsa); -int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen, - const unsigned char *from, int flen, const unsigned char *param, int plen, - const EVP_MD *md, const EVP_MD *mgf1md); -int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen, - const unsigned char *from, int flen, int num, const unsigned char *param, - int plen, const EVP_MD *md, const EVP_MD *mgf1md); - __END_HIDDEN_DECLS |