summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs7/pk7_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/pkcs7/pk7_lib.c')
-rw-r--r--src/lib/libcrypto/pkcs7/pk7_lib.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_lib.c b/src/lib/libcrypto/pkcs7/pk7_lib.c
index 7aedc3c44e..b3dc068f3d 100644
--- a/src/lib/libcrypto/pkcs7/pk7_lib.c
+++ b/src/lib/libcrypto/pkcs7/pk7_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pk7_lib.c,v 1.17 2015/09/30 17:30:15 jsing Exp $ */ 1/* $OpenBSD: pk7_lib.c,v 1.18 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 *
@@ -181,7 +181,7 @@ PKCS7_set_type(PKCS7 *p7, int type)
181 break; 181 break;
182 case NID_pkcs7_data: 182 case NID_pkcs7_data:
183 p7->type = obj; 183 p7->type = obj;
184 if ((p7->d.data = M_ASN1_OCTET_STRING_new()) == NULL) 184 if ((p7->d.data = ASN1_OCTET_STRING_new()) == NULL)
185 goto err; 185 goto err;
186 break; 186 break;
187 case NID_pkcs7_signedAndEnveloped: 187 case NID_pkcs7_signedAndEnveloped:
@@ -636,7 +636,7 @@ PKCS7_stream(unsigned char ***boundary, PKCS7 *p7)
636 case NID_pkcs7_signedAndEnveloped: 636 case NID_pkcs7_signedAndEnveloped:
637 os = p7->d.signed_and_enveloped->enc_data->enc_data; 637 os = p7->d.signed_and_enveloped->enc_data->enc_data;
638 if (os == NULL) { 638 if (os == NULL) {
639 os = M_ASN1_OCTET_STRING_new(); 639 os = ASN1_OCTET_STRING_new();
640 p7->d.signed_and_enveloped->enc_data->enc_data = os; 640 p7->d.signed_and_enveloped->enc_data->enc_data = os;
641 } 641 }
642 break; 642 break;
@@ -644,7 +644,7 @@ PKCS7_stream(unsigned char ***boundary, PKCS7 *p7)
644 case NID_pkcs7_enveloped: 644 case NID_pkcs7_enveloped:
645 os = p7->d.enveloped->enc_data->enc_data; 645 os = p7->d.enveloped->enc_data->enc_data;
646 if (os == NULL) { 646 if (os == NULL) {
647 os = M_ASN1_OCTET_STRING_new(); 647 os = ASN1_OCTET_STRING_new();
648 p7->d.enveloped->enc_data->enc_data = os; 648 p7->d.enveloped->enc_data->enc_data = os;
649 } 649 }
650 break; 650 break;