summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/x_pkey.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/asn1/x_pkey.c')
-rw-r--r--src/lib/libcrypto/asn1/x_pkey.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/asn1/x_pkey.c b/src/lib/libcrypto/asn1/x_pkey.c
index 28e79858b5..701db0fc6d 100644
--- a/src/lib/libcrypto/asn1/x_pkey.c
+++ b/src/lib/libcrypto/asn1/x_pkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x_pkey.c,v 1.18 2015/07/27 12:53:56 jsing Exp $ */ 1/* $OpenBSD: x_pkey.c,v 1.19 2015/09/30 18:41:06 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -78,7 +78,7 @@ X509_PKEY_new(void)
78 ASN1err(ASN1_F_X509_PKEY_NEW, ERR_R_MALLOC_FAILURE); 78 ASN1err(ASN1_F_X509_PKEY_NEW, ERR_R_MALLOC_FAILURE);
79 goto err; 79 goto err;
80 } 80 }
81 if ((ret->enc_pkey = M_ASN1_OCTET_STRING_new()) == NULL) { 81 if ((ret->enc_pkey = ASN1_OCTET_STRING_new()) == NULL) {
82 ASN1err(ASN1_F_X509_PKEY_NEW, ERR_R_MALLOC_FAILURE); 82 ASN1err(ASN1_F_X509_PKEY_NEW, ERR_R_MALLOC_FAILURE);
83 goto err; 83 goto err;
84 } 84 }
@@ -113,7 +113,7 @@ X509_PKEY_free(X509_PKEY *x)
113 113
114 if (x->enc_algor != NULL) 114 if (x->enc_algor != NULL)
115 X509_ALGOR_free(x->enc_algor); 115 X509_ALGOR_free(x->enc_algor);
116 M_ASN1_OCTET_STRING_free(x->enc_pkey); 116 ASN1_OCTET_STRING_free(x->enc_pkey);
117 EVP_PKEY_free(x->dec_pkey); 117 EVP_PKEY_free(x->dec_pkey);
118 if ((x->key_data != NULL) && (x->key_free)) 118 if ((x->key_data != NULL) && (x->key_free))
119 free(x->key_data); 119 free(x->key_data);