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

Add rsa_pss_get_param. 



New function rsa_pss_get_param to extract and sanity check PSS parameters.

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 53d2260c

crypto/rsa/rsa_ameth.c

+33 −31
Original line number Diff line number Diff line
@@ -596,42 +596,12 @@ static int rsa_pss_to_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pkctx, 
    /* Decode PSS parameters */

    pss = rsa_pss_decode(sigalg);



    if (pss == NULL) {

    if (!rsa_pss_get_param(pss, &md, &mgf1md, &saltlen)) {

        RSAerr(RSA_F_RSA_PSS_TO_CTX, RSA_R_INVALID_PSS_PARAMETERS);

        goto err;

    }

    mgf1md = rsa_algor_to_md(pss->maskHash);

    if (!mgf1md)

        goto err;

    md = rsa_algor_to_md(pss->hashAlgorithm);

    if (!md)

        goto err;



    if (pss->saltLength) {

        saltlen = ASN1_INTEGER_get(pss->saltLength);



        /*

         * Could perform more salt length sanity checks but the main RSA

         * routines will trap other invalid values anyway.

         */

        if (saltlen < 0) {

            RSAerr(RSA_F_RSA_PSS_TO_CTX, RSA_R_INVALID_SALT_LENGTH);

            goto err;

        }

    } else

        saltlen = 20;



    /*

     * low-level routines support only trailer field 0xbc (value 1) and

     * PKCS#1 says we should reject any other value anyway.

     */

    if (pss->trailerField && ASN1_INTEGER_get(pss->trailerField) != 1) {

        RSAerr(RSA_F_RSA_PSS_TO_CTX, RSA_R_INVALID_TRAILER);

        goto err;

    }



    /* We have all parameters now set up context */



    if (pkey) {

        if (!EVP_DigestVerifyInit(ctx, &pkctx, md, NULL, pkey))

            goto err;
@@ -661,6 +631,38 @@ static int rsa_pss_to_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pkctx, 
    return rv;

}



int rsa_pss_get_param(const RSA_PSS_PARAMS *pss, const EVP_MD **pmd,

                      const EVP_MD **pmgf1md, int *psaltlen)

{

    if (pss == NULL)

        return 0;

    *pmd = rsa_algor_to_md(pss->hashAlgorithm);

    if (*pmd == NULL)

        return 0;

    *pmgf1md = rsa_algor_to_md(pss->maskHash);

    if (*pmgf1md == NULL)

        return 0;

    if (pss->saltLength) {

        *psaltlen = ASN1_INTEGER_get(pss->saltLength);

        if (*psaltlen < 0) {

            RSAerr(RSA_F_RSA_PSS_GET_PARAM, RSA_R_INVALID_SALT_LENGTH);

            return 0;

        }

    } else

        *psaltlen = 20;



    /*

     * low-level routines support only trailer field 0xbc (value 1) and

     * PKCS#1 says we should reject any other value anyway.

     */

    if (pss->trailerField && ASN1_INTEGER_get(pss->trailerField) != 1) {

        RSAerr(RSA_F_RSA_PSS_GET_PARAM, RSA_R_INVALID_TRAILER);

        return 0; 

    }



    return 1;

}



#ifndef OPENSSL_NO_CMS

static int rsa_cms_verify(CMS_SignerInfo *si)

{

crypto/rsa/rsa_err.c

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ static ERR_STRING_DATA RSA_str_functs[] = { 
    {ERR_FUNC(RSA_F_RSA_PRINT_FP), "RSA_print_fp"},

    {ERR_FUNC(RSA_F_RSA_PRIV_DECODE), "rsa_priv_decode"},

    {ERR_FUNC(RSA_F_RSA_PRIV_ENCODE), "rsa_priv_encode"},

    {ERR_FUNC(RSA_F_RSA_PSS_GET_PARAM), "rsa_pss_get_param"},

    {ERR_FUNC(RSA_F_RSA_PSS_TO_CTX), "rsa_pss_to_ctx"},

    {ERR_FUNC(RSA_F_RSA_PUB_DECODE), "rsa_pub_decode"},

    {ERR_FUNC(RSA_F_RSA_SETUP_BLINDING), "RSA_setup_blinding"},

crypto/rsa/rsa_locl.h

+2 −0
Original line number Diff line number Diff line
@@ -103,3 +103,5 @@ extern int int_rsa_verify(int dtype, const unsigned char *m, 


RSA_PSS_PARAMS *rsa_pss_params_create(const EVP_MD *sigmd,

                                      const EVP_MD *mgf1md, int saltlen);

int rsa_pss_get_param(const RSA_PSS_PARAMS *pss, const EVP_MD **pmd,

                      const EVP_MD **pmgf1md, int *psaltlen);

include/openssl/rsa.h

+1 −0
Original line number Diff line number Diff line
@@ -525,6 +525,7 @@ int ERR_load_RSA_strings(void); 
# define RSA_F_RSA_PRINT_FP                               116

# define RSA_F_RSA_PRIV_DECODE                            150

# define RSA_F_RSA_PRIV_ENCODE                            138

# define RSA_F_RSA_PSS_GET_PARAM                          151

# define RSA_F_RSA_PSS_TO_CTX                             155

# define RSA_F_RSA_PUB_DECODE                             139

# define RSA_F_RSA_SETUP_BLINDING                         136