Commit f488976c authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

fix typo and remove duplicate macro 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2177)
parent c9165050

include/openssl/rsa.h

+3 −7
Original line number Diff line number Diff line
@@ -103,10 +103,6 @@ extern "C" { 
        RSA_pkey_ctx_ctrl(ctx, (EVP_PKEY_OP_SIGN|EVP_PKEY_OP_VERIFY), \

                          EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN, 0, plen)



# define EVP_PKEY_CTX_set_rsa_pss_keygen_saltlen(ctx, len) \

        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN, \

                          EVP_PKEY_CTRL_RSA_PSS_SALTLEN, len, NULL)



# define EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, bits) \

        RSA_pkey_ctx_ctrl(ctx, EVP_PKEY_OP_KEYGEN, \

                          EVP_PKEY_CTRL_RSA_KEYGEN_BITS, bits, NULL)
@@ -143,9 +139,9 @@ extern "C" { 
                EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,  \

                                EVP_PKEY_CTRL_GET_RSA_OAEP_LABEL, 0, (void *)l)



# define  EVP_PKEY_CTX_rsa_pss_key_digest(ctx, md)  \

                EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSAi_PSS, \

                                  EVP_PKEY_OP_TYPE_CRYPT, EVP_PKEY_CTRL_MD, \

# define  EVP_PKEY_CTX_rsa_pss_keygen_md(ctx, md)  \

                EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA_PSS, \

                                  EVP_PKEY_OP_TYPE_KEYGEN, EVP_PKEY_CTRL_MD, \

                                  0, (void *)md)



# define EVP_PKEY_CTRL_RSA_PADDING       (EVP_PKEY_ALG_CTRL + 1)