diff options
Diffstat (limited to 'src/lib/libcrypto/asn1/x_pubkey.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/x_pubkey.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/asn1/x_pubkey.c b/src/lib/libcrypto/asn1/x_pubkey.c index 7a05d575c9..b2e2a51477 100644 --- a/src/lib/libcrypto/asn1/x_pubkey.c +++ b/src/lib/libcrypto/asn1/x_pubkey.c | |||
| @@ -112,7 +112,7 @@ void X509_PUBKEY_free(X509_PUBKEY *a) | |||
| 112 | X509_ALGOR_free(a->algor); | 112 | X509_ALGOR_free(a->algor); |
| 113 | M_ASN1_BIT_STRING_free(a->public_key); | 113 | M_ASN1_BIT_STRING_free(a->public_key); |
| 114 | if (a->pkey != NULL) EVP_PKEY_free(a->pkey); | 114 | if (a->pkey != NULL) EVP_PKEY_free(a->pkey); |
| 115 | Free(a); | 115 | OPENSSL_free(a); |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) | 118 | int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) |
| @@ -156,14 +156,14 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) | |||
| 156 | dsa->write_params=0; | 156 | dsa->write_params=0; |
| 157 | ASN1_TYPE_free(a->parameter); | 157 | ASN1_TYPE_free(a->parameter); |
| 158 | i=i2d_DSAparams(dsa,NULL); | 158 | i=i2d_DSAparams(dsa,NULL); |
| 159 | p=(unsigned char *)Malloc(i); | 159 | p=(unsigned char *)OPENSSL_malloc(i); |
| 160 | pp=p; | 160 | pp=p; |
| 161 | i2d_DSAparams(dsa,&pp); | 161 | i2d_DSAparams(dsa,&pp); |
| 162 | a->parameter=ASN1_TYPE_new(); | 162 | a->parameter=ASN1_TYPE_new(); |
| 163 | a->parameter->type=V_ASN1_SEQUENCE; | 163 | a->parameter->type=V_ASN1_SEQUENCE; |
| 164 | a->parameter->value.sequence=ASN1_STRING_new(); | 164 | a->parameter->value.sequence=ASN1_STRING_new(); |
| 165 | ASN1_STRING_set(a->parameter->value.sequence,p,i); | 165 | ASN1_STRING_set(a->parameter->value.sequence,p,i); |
| 166 | Free(p); | 166 | OPENSSL_free(p); |
| 167 | } | 167 | } |
| 168 | else | 168 | else |
| 169 | #endif | 169 | #endif |
| @@ -173,7 +173,7 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) | |||
| 173 | } | 173 | } |
| 174 | 174 | ||
| 175 | if ((i=i2d_PublicKey(pkey,NULL)) <= 0) goto err; | 175 | if ((i=i2d_PublicKey(pkey,NULL)) <= 0) goto err; |
| 176 | if ((s=(unsigned char *)Malloc(i+1)) == NULL) goto err; | 176 | if ((s=(unsigned char *)OPENSSL_malloc(i+1)) == NULL) goto err; |
| 177 | p=s; | 177 | p=s; |
| 178 | i2d_PublicKey(pkey,&p); | 178 | i2d_PublicKey(pkey,&p); |
| 179 | if (!M_ASN1_BIT_STRING_set(pk->public_key,s,i)) goto err; | 179 | if (!M_ASN1_BIT_STRING_set(pk->public_key,s,i)) goto err; |
| @@ -181,7 +181,7 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) | |||
| 181 | pk->public_key->flags&= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); | 181 | pk->public_key->flags&= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); |
| 182 | pk->public_key->flags|=ASN1_STRING_FLAG_BITS_LEFT; | 182 | pk->public_key->flags|=ASN1_STRING_FLAG_BITS_LEFT; |
| 183 | 183 | ||
| 184 | Free(s); | 184 | OPENSSL_free(s); |
| 185 | 185 | ||
| 186 | #if 0 | 186 | #if 0 |
| 187 | CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY); | 187 | CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY); |
