summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs7/pkcs7.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/pkcs7/pkcs7.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/libcrypto/pkcs7/pkcs7.h b/src/lib/libcrypto/pkcs7/pkcs7.h
index ab9f5dc534..d3f398dc34 100644
--- a/src/lib/libcrypto/pkcs7/pkcs7.h
+++ b/src/lib/libcrypto/pkcs7/pkcs7.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkcs7.h,v 1.16 2016/12/27 15:35:59 jsing Exp $ */ 1/* $OpenBSD: pkcs7.h,v 1.17 2016/12/27 16:05:57 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 *
@@ -95,7 +95,6 @@ typedef struct pkcs7_signer_info_st {
95} PKCS7_SIGNER_INFO; 95} PKCS7_SIGNER_INFO;
96 96
97DECLARE_STACK_OF(PKCS7_SIGNER_INFO) 97DECLARE_STACK_OF(PKCS7_SIGNER_INFO)
98DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO)
99 98
100typedef struct pkcs7_recip_info_st { 99typedef struct pkcs7_recip_info_st {
101 ASN1_INTEGER *version; /* version 0 */ 100 ASN1_INTEGER *version; /* version 0 */
@@ -106,7 +105,6 @@ typedef struct pkcs7_recip_info_st {
106} PKCS7_RECIP_INFO; 105} PKCS7_RECIP_INFO;
107 106
108DECLARE_STACK_OF(PKCS7_RECIP_INFO) 107DECLARE_STACK_OF(PKCS7_RECIP_INFO)
109DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO)
110 108
111typedef struct pkcs7_signed_st { 109typedef struct pkcs7_signed_st {
112 ASN1_INTEGER *version; /* version 1 */ 110 ASN1_INTEGER *version; /* version 1 */
@@ -200,7 +198,6 @@ typedef struct pkcs7_st {
200} PKCS7; 198} PKCS7;
201 199
202DECLARE_STACK_OF(PKCS7) 200DECLARE_STACK_OF(PKCS7)
203DECLARE_ASN1_SET_OF(PKCS7)
204DECLARE_PKCS12_STACK_OF(PKCS7) 201DECLARE_PKCS12_STACK_OF(PKCS7)
205 202
206#define PKCS7_OP_SET_DETACHED_SIGNATURE 1 203#define PKCS7_OP_SET_DETACHED_SIGNATURE 1