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

Remove duplicate code. 



Update code to use ASN1_TYPE_pack_sequence and ASN1_TYPE_unpack_sequence
instead of performing the same operation manually.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 22f5bd3d

crypto/asn1/p5_pbev2.c

+4 −11
Original line number Diff line number Diff line
@@ -165,17 +165,14 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, 


    if (!(ret = X509_ALGOR_new()))

        goto merr;

    if (!(ret->parameter = ASN1_TYPE_new()))

        goto merr;



    ret->algorithm = OBJ_nid2obj(NID_pbes2);



    /* Encode PBE2PARAM into parameter */



    if (!ASN1_item_pack(pbe2, ASN1_ITEM_rptr(PBE2PARAM),

                        &ret->parameter->value.sequence))

    if (!ASN1_TYPE_pack_sequence(ASN1_ITEM_rptr(PBE2PARAM), pbe2,

                                 &ret->parameter))

         goto merr;

    ret->parameter->type = V_ASN1_SEQUENCE;



    PBE2PARAM_free(pbe2);

    pbe2 = NULL;
@@ -261,13 +258,9 @@ X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, 


    /* Encode PBKDF2PARAM into parameter of pbe2 */



    if (!(keyfunc->parameter = ASN1_TYPE_new()))

        goto merr;



    if (!ASN1_item_pack(kdf, ASN1_ITEM_rptr(PBKDF2PARAM),

                        &keyfunc->parameter->value.sequence))

    if (!ASN1_TYPE_pack_sequence(ASN1_ITEM_rptr(PBKDF2PARAM), kdf,

                                 &keyfunc->parameter))

         goto merr;

    keyfunc->parameter->type = V_ASN1_SEQUENCE;



    PBKDF2PARAM_free(kdf);

    return keyfunc;

crypto/cms/cms_pwri.c

+3 −7
Original line number Diff line number Diff line
@@ -320,8 +320,6 @@ int cms_RecipientInfo_pwri_crypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri, 
{

    CMS_EncryptedContentInfo *ec;

    CMS_PasswordRecipientInfo *pwri;

    const unsigned char *p = NULL;

    int plen;

    int r = 0;

    X509_ALGOR *algtmp, *kekalg = NULL;

    EVP_CIPHER_CTX kekctx;
@@ -346,11 +344,9 @@ int cms_RecipientInfo_pwri_crypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri, 
        return 0;

    }



    if (algtmp->parameter->type == V_ASN1_SEQUENCE) {

        p = algtmp->parameter->value.sequence->data;

        plen = algtmp->parameter->value.sequence->length;

        kekalg = d2i_X509_ALGOR(NULL, &p, plen);

    }

    kekalg = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(X509_ALGOR),

                                       algtmp->parameter);



    if (kekalg == NULL) {

        CMSerr(CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT,

               CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER);

crypto/evp/p5_crpt.c

+2 −3
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen, 
    PBEPARAM *pbe;

    int saltlen, iter;

    unsigned char *salt;

    const unsigned char *pbuf;

    int mdsize;

    int rv = 0;

    EVP_MD_CTX_init(&ctx);
@@ -94,8 +93,8 @@ int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen, 
        return 0;

    }



    pbuf = param->value.sequence->data;

    if (!(pbe = d2i_PBEPARAM(NULL, &pbuf, param->value.sequence->length))) {

    pbe = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(PBEPARAM), param);

    if (pbe == NULL) {

        EVPerr(EVP_F_PKCS5_PBE_KEYIVGEN, EVP_R_DECODE_ERROR);

        return 0;

    }

crypto/evp/p5_crpt2.c

+5 −21
Original line number Diff line number Diff line
@@ -190,23 +190,14 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, 
                          ASN1_TYPE *param, const EVP_CIPHER *c,

                          const EVP_MD *md, int en_de)

{

    const unsigned char *pbuf;

    int plen;

    PBE2PARAM *pbe2 = NULL;

    const EVP_CIPHER *cipher;

    EVP_PBE_KEYGEN *kdf;



    int rv = 0;



    if (param == NULL || param->type != V_ASN1_SEQUENCE ||

        param->value.sequence == NULL) {

        EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN, EVP_R_DECODE_ERROR);

        goto err;

    }



    pbuf = param->value.sequence->data;

    plen = param->value.sequence->length;

    if (!(pbe2 = d2i_PBE2PARAM(NULL, &pbuf, plen))) {

    pbe2 = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(PBE2PARAM), param);

    if (pbe2 == NULL) {

        EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN, EVP_R_DECODE_ERROR);

        goto err;

    }
@@ -248,8 +239,7 @@ int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, 
                             const EVP_CIPHER *c, const EVP_MD *md, int en_de)

{

    unsigned char *salt, key[EVP_MAX_KEY_LENGTH];

    const unsigned char *pbuf;

    int saltlen, iter, plen;

    int saltlen, iter;

    int rv = 0;

    unsigned int keylen = 0;

    int prf_nid, hmac_md_nid;
@@ -265,15 +255,9 @@ int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, 


    /* Decode parameter */



    if (!param || (param->type != V_ASN1_SEQUENCE)) {

        EVPerr(EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN, EVP_R_DECODE_ERROR);

        goto err;

    }



    pbuf = param->value.sequence->data;

    plen = param->value.sequence->length;

    kdf = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(PBKDF2PARAM), param);



    if (!(kdf = d2i_PBKDF2PARAM(NULL, &pbuf, plen))) {

    if (kdf == NULL) {

        EVPerr(EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN, EVP_R_DECODE_ERROR);

        goto err;

    }

crypto/pkcs12/p12_crpt.c

+2 −8
Original line number Diff line number Diff line
@@ -74,18 +74,12 @@ int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, 
    PBEPARAM *pbe;

    int saltlen, iter, ret;

    unsigned char *salt;

    const unsigned char *pbuf;

    unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH];



    /* Extract useful info from parameter */

    if (param == NULL || param->type != V_ASN1_SEQUENCE ||

        param->value.sequence == NULL) {

        PKCS12err(PKCS12_F_PKCS12_PBE_KEYIVGEN, PKCS12_R_DECODE_ERROR);

        return 0;

    }



    pbuf = param->value.sequence->data;

    if (!(pbe = d2i_PBEPARAM(NULL, &pbuf, param->value.sequence->length))) {

    pbe = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(PBEPARAM), param);

    if (pbe == NULL) {

        PKCS12err(PKCS12_F_PKCS12_PBE_KEYIVGEN, PKCS12_R_DECODE_ERROR);

        return 0;

    }