diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/Symbols.list | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/rsa/rsa.h | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/rsa/rsa_locl.h | 9 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list index ea6913d8f6..a9e97d7399 100644 --- a/src/lib/libcrypto/Symbols.list +++ b/src/lib/libcrypto/Symbols.list | |||
@@ -2467,6 +2467,7 @@ RSA_meth_set_verify | |||
2467 | RSA_new | 2467 | RSA_new |
2468 | RSA_new_method | 2468 | RSA_new_method |
2469 | RSA_padding_add_PKCS1_OAEP | 2469 | RSA_padding_add_PKCS1_OAEP |
2470 | RSA_padding_add_PKCS1_OAEP_mgf1 | ||
2470 | RSA_padding_add_PKCS1_PSS | 2471 | RSA_padding_add_PKCS1_PSS |
2471 | RSA_padding_add_PKCS1_PSS_mgf1 | 2472 | RSA_padding_add_PKCS1_PSS_mgf1 |
2472 | RSA_padding_add_PKCS1_type_1 | 2473 | RSA_padding_add_PKCS1_type_1 |
@@ -2474,6 +2475,7 @@ RSA_padding_add_PKCS1_type_2 | |||
2474 | RSA_padding_add_X931 | 2475 | RSA_padding_add_X931 |
2475 | RSA_padding_add_none | 2476 | RSA_padding_add_none |
2476 | RSA_padding_check_PKCS1_OAEP | 2477 | RSA_padding_check_PKCS1_OAEP |
2478 | RSA_padding_check_PKCS1_OAEP_mgf1 | ||
2477 | RSA_padding_check_PKCS1_type_1 | 2479 | RSA_padding_check_PKCS1_type_1 |
2478 | RSA_padding_check_PKCS1_type_2 | 2480 | RSA_padding_check_PKCS1_type_2 |
2479 | RSA_padding_check_X931 | 2481 | RSA_padding_check_X931 |
diff --git a/src/lib/libcrypto/rsa/rsa.h b/src/lib/libcrypto/rsa/rsa.h index 0c6f5b920d..9dd840006f 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.48 2019/11/02 13:44:19 jsing Exp $ */ | 1 | /* $OpenBSD: rsa.h,v 1.49 2019/11/02 13:47:41 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 | * |
@@ -430,6 +430,12 @@ int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen, | |||
430 | int RSA_padding_check_PKCS1_OAEP(unsigned char *to, int tlen, | 430 | int RSA_padding_check_PKCS1_OAEP(unsigned char *to, int tlen, |
431 | const unsigned char *f, int fl, int rsa_len, | 431 | const unsigned char *f, int fl, int rsa_len, |
432 | const unsigned char *p, int pl); | 432 | const unsigned char *p, int pl); |
433 | int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen, | ||
434 | const unsigned char *from, int flen, const unsigned char *param, int plen, | ||
435 | const EVP_MD *md, const EVP_MD *mgf1md); | ||
436 | int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen, | ||
437 | const unsigned char *from, int flen, int num, const unsigned char *param, | ||
438 | int plen, const EVP_MD *md, const EVP_MD *mgf1md); | ||
433 | int RSA_padding_add_none(unsigned char *to, int tlen, | 439 | int RSA_padding_add_none(unsigned char *to, int tlen, |
434 | const unsigned char *f, int fl); | 440 | const unsigned char *f, int fl); |
435 | int RSA_padding_check_none(unsigned char *to, int tlen, | 441 | int RSA_padding_check_none(unsigned char *to, int tlen, |
diff --git a/src/lib/libcrypto/rsa/rsa_locl.h b/src/lib/libcrypto/rsa/rsa_locl.h index ef4dddd16b..7036449c36 100644 --- a/src/lib/libcrypto/rsa/rsa_locl.h +++ b/src/lib/libcrypto/rsa/rsa_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rsa_locl.h,v 1.10 2019/11/02 13:44:19 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_locl.h,v 1.11 2019/11/02 13:47:41 jsing Exp $ */ |
2 | 2 | ||
3 | __BEGIN_HIDDEN_DECLS | 3 | __BEGIN_HIDDEN_DECLS |
4 | 4 | ||
@@ -17,11 +17,4 @@ extern int int_rsa_verify(int dtype, const unsigned char *m, | |||
17 | unsigned int m_len, unsigned char *rm, size_t *prm_len, | 17 | unsigned int m_len, unsigned char *rm, size_t *prm_len, |
18 | const unsigned char *sigbuf, size_t siglen, RSA *rsa); | 18 | const unsigned char *sigbuf, size_t siglen, RSA *rsa); |
19 | 19 | ||
20 | int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen, | ||
21 | const unsigned char *from, int flen, const unsigned char *param, int plen, | ||
22 | const EVP_MD *md, const EVP_MD *mgf1md); | ||
23 | int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen, | ||
24 | const unsigned char *from, int flen, int num, const unsigned char *param, | ||
25 | int plen, const EVP_MD *md, const EVP_MD *mgf1md); | ||
26 | |||
27 | __END_HIDDEN_DECLS | 20 | __END_HIDDEN_DECLS |