diff options
author | jsing <> | 2019-08-11 08:15:27 +0000 |
---|---|---|
committer | jsing <> | 2019-08-11 08:15:27 +0000 |
commit | fa447988cd063cd304b8a827bbc5ad99dea4a159 (patch) | |
tree | 354a4e147e34af4e9d362538ee666ce57a7b458e | |
parent | 1c1579ab04dc58affcb00621bf4860581d8a70e1 (diff) | |
download | openbsd-fa447988cd063cd304b8a827bbc5ad99dea4a159.tar.gz openbsd-fa447988cd063cd304b8a827bbc5ad99dea4a159.tar.bz2 openbsd-fa447988cd063cd304b8a827bbc5ad99dea4a159.zip |
We use DECLARE_STACK_OF rather than DEFINE_STACK_OF.
-rw-r--r-- | src/lib/libcrypto/cms/cms.h | 10 | ||||
-rw-r--r-- | src/lib/libcrypto/cms/cms_lcl.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/cms/cms.h b/src/lib/libcrypto/cms/cms.h index ecb516b203..d639667777 100644 --- a/src/lib/libcrypto/cms/cms.h +++ b/src/lib/libcrypto/cms/cms.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cms.h,v 1.13 2019/08/11 06:47:18 jsing Exp $ */ | 1 | /* $OpenBSD: cms.h,v 1.14 2019/08/11 08:15:27 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
4 | * project. | 4 | * project. |
@@ -74,10 +74,10 @@ typedef struct CMS_Receipt_st CMS_Receipt; | |||
74 | typedef struct CMS_RecipientEncryptedKey_st CMS_RecipientEncryptedKey; | 74 | typedef struct CMS_RecipientEncryptedKey_st CMS_RecipientEncryptedKey; |
75 | typedef struct CMS_OtherKeyAttribute_st CMS_OtherKeyAttribute; | 75 | typedef struct CMS_OtherKeyAttribute_st CMS_OtherKeyAttribute; |
76 | 76 | ||
77 | DEFINE_STACK_OF(CMS_SignerInfo) | 77 | DECLARE_STACK_OF(CMS_SignerInfo) |
78 | DEFINE_STACK_OF(CMS_RecipientEncryptedKey) | 78 | DECLARE_STACK_OF(CMS_RecipientEncryptedKey) |
79 | DEFINE_STACK_OF(CMS_RecipientInfo) | 79 | DECLARE_STACK_OF(CMS_RecipientInfo) |
80 | DEFINE_STACK_OF(CMS_RevocationInfoChoice) | 80 | DECLARE_STACK_OF(CMS_RevocationInfoChoice) |
81 | DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo) | 81 | DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo) |
82 | DECLARE_ASN1_FUNCTIONS(CMS_ReceiptRequest) | 82 | DECLARE_ASN1_FUNCTIONS(CMS_ReceiptRequest) |
83 | DECLARE_ASN1_PRINT_FUNCTION(CMS_ContentInfo) | 83 | DECLARE_ASN1_PRINT_FUNCTION(CMS_ContentInfo) |
diff --git a/src/lib/libcrypto/cms/cms_lcl.h b/src/lib/libcrypto/cms/cms_lcl.h index 3dbfa43f20..6504ee31a1 100644 --- a/src/lib/libcrypto/cms/cms_lcl.h +++ b/src/lib/libcrypto/cms/cms_lcl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cms_lcl.h,v 1.8 2019/08/10 18:27:49 jsing Exp $ */ | 1 | /* $OpenBSD: cms_lcl.h,v 1.9 2019/08/11 08:15:27 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
4 | * project. | 4 | * project. |
@@ -105,7 +105,7 @@ struct CMS_ContentInfo_st { | |||
105 | } d; | 105 | } d; |
106 | }; | 106 | }; |
107 | 107 | ||
108 | DEFINE_STACK_OF(CMS_CertificateChoices) | 108 | DECLARE_STACK_OF(CMS_CertificateChoices) |
109 | 109 | ||
110 | struct CMS_SignedData_st { | 110 | struct CMS_SignedData_st { |
111 | int32_t version; | 111 | int32_t version; |