Constification.

[oweals/openssl.git] / crypto / asn1 / p5_pbev2.c

diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c
index 09f4bf61121b2a0a9c064c59ccf8ac57ea68b338..19888473e67f546a2ad67311b97c6a10f8232943 100644 (file)
--- a/crypto/asn1/p5_pbev2.c
+++ b/crypto/asn1/p5_pbev2.c
@@ -131,7 +131,7 @@ PBKDF2PARAM *PBKDF2PARAM_new(void)
        ASN1_CTX c;
        M_ASN1_New_Malloc(ret, PBKDF2PARAM);
        M_ASN1_New(ret->salt, ASN1_TYPE_new);
-       M_ASN1_New(ret->iter, ASN1_INTEGER_new);
+       M_ASN1_New(ret->iter, M_ASN1_INTEGER_new);
        ret->keylength = NULL;
        ret->prf = NULL;
        return (ret);
@@ -155,8 +155,8 @@ void PBKDF2PARAM_free (PBKDF2PARAM *a)
 {
        if(a==NULL) return;
        ASN1_TYPE_free(a->salt);
-       ASN1_INTEGER_free(a->iter);
-       ASN1_INTEGER_free(a->keylength);
+       M_ASN1_INTEGER_free(a->iter);
+       M_ASN1_INTEGER_free(a->keylength);
        X509_ALGOR_free(a->prf);
        Free ((char *)a);
 }
@@ -199,7 +199,7 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
        EVP_CIPHER_CTX_cleanup(&ctx);
 
        if(!(kdf = PBKDF2PARAM_new())) goto merr;
-       if(!(osalt = ASN1_OCTET_STRING_new())) goto merr;
+       if(!(osalt = M_ASN1_OCTET_STRING_new())) goto merr;
 
        if (!saltlen) saltlen = PKCS5_SALT_LEN;
        if (!(osalt->data = Malloc (saltlen))) goto merr;
@@ -218,7 +218,7 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
        /* If its RC2 then we'd better setup the key length */
 
        if(alg_nid == NID_rc2_cbc) {
-               if(!(kdf->keylength = ASN1_INTEGER_new())) goto merr;
+               if(!(kdf->keylength = M_ASN1_INTEGER_new())) goto merr;
                if(!ASN1_INTEGER_set (kdf->keylength,
                                 EVP_CIPHER_key_length(cipher))) goto merr;
        }
@@ -264,7 +264,7 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
        err:
        PBE2PARAM_free(pbe2);
        /* Note 'scheme' is freed as part of pbe2 */
-       ASN1_OCTET_STRING_free(osalt);
+       M_ASN1_OCTET_STRING_free(osalt);
        PBKDF2PARAM_free(kdf);
        X509_ALGOR_free(kalg);
        X509_ALGOR_free(ret);