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

fix a few more style issues 



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 76951372

crypto/evp/pmeth_lib.c

+1 −0
Original line number Diff line number Diff line
@@ -367,6 +367,7 @@ int EVP_PKEY_CTX_hex2ctrl(EVP_PKEY_CTX *ctx, int cmd, const char *hex) 
int EVP_PKEY_CTX_md(EVP_PKEY_CTX *ctx, int optype, int cmd, const char *md)

{

    const EVP_MD *m;



    if (md == NULL || (m = EVP_get_digestbyname(md)) == NULL) {

        EVPerr(EVP_F_EVP_PKEY_CTX_MD, EVP_R_INVALID_DIGEST);

        return 0;

crypto/rsa/rsa_ameth.c

+3 −1
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ static int rsa_sig_print(BIO *bp, const X509_ALGOR *sigalg, 
    if (OBJ_obj2nid(sigalg->algorithm) == EVP_PKEY_RSA_PSS) {

        int rv;

        RSA_PSS_PARAMS *pss = rsa_pss_decode(sigalg);



        rv = rsa_pss_param_print(bp, 0, pss, indent);

        RSA_PSS_PARAMS_free(pss);

        if (!rv)
@@ -659,8 +660,9 @@ int rsa_pss_get_param(const RSA_PSS_PARAMS *pss, const EVP_MD **pmd, 
            RSAerr(RSA_F_RSA_PSS_GET_PARAM, RSA_R_INVALID_SALT_LENGTH);

            return 0;

        }

    } else

    } else {

        *psaltlen = 20;

    }



    /*

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

crypto/rsa/rsa_pmeth.c

+2 −2
Original line number Diff line number Diff line
@@ -626,8 +626,8 @@ static int pkey_rsa_ctrl_str(EVP_PKEY_CTX *ctx, 
                                   EVP_PKEY_CTRL_MD, value);



        if (strcmp(type, "rsa_pss_keygen_saltlen") == 0) {

            int saltlen;

            saltlen = atoi(value);

            int saltlen = atoi(value);



            return EVP_PKEY_CTX_set_rsa_pss_keygen_saltlen(ctx, saltlen);

        }

    }