summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/cms
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/cms')
-rw-r--r--src/lib/libcrypto/cms/cms_cd.c11
-rw-r--r--src/lib/libcrypto/cms/cms_dd.c8
-rw-r--r--src/lib/libcrypto/cms/cms_enc.c10
-rw-r--r--src/lib/libcrypto/cms/cms_env.c12
-rw-r--r--src/lib/libcrypto/cms/cms_ess.c8
-rw-r--r--src/lib/libcrypto/cms/cms_pwri.c14
-rw-r--r--src/lib/libcrypto/cms/cms_sd.c10
-rw-r--r--src/lib/libcrypto/cms/cms_smime.c8
8 files changed, 41 insertions, 40 deletions
diff --git a/src/lib/libcrypto/cms/cms_cd.c b/src/lib/libcrypto/cms/cms_cd.c
index 2a67c5df30..bcf1506916 100644
--- a/src/lib/libcrypto/cms/cms_cd.c
+++ b/src/lib/libcrypto/cms/cms_cd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cms_cd.c,v 1.4 2014/07/10 22:45:56 jsing Exp $ */ 1/* $OpenBSD: cms_cd.c,v 1.5 2014/07/11 08:44:48 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -53,16 +53,17 @@
53 53
54#include <openssl/opensslconf.h> 54#include <openssl/opensslconf.h>
55 55
56#include "cryptlib.h"
57#include <openssl/asn1t.h> 56#include <openssl/asn1t.h>
57#include <openssl/bio.h>
58#include <openssl/cms.h>
59#include <openssl/err.h>
58#include <openssl/pem.h> 60#include <openssl/pem.h>
59#include <openssl/x509v3.h> 61#include <openssl/x509v3.h>
60#include <openssl/err.h> 62
61#include <openssl/cms.h>
62#include <openssl/bio.h>
63#ifndef OPENSSL_NO_COMP 63#ifndef OPENSSL_NO_COMP
64#include <openssl/comp.h> 64#include <openssl/comp.h>
65#endif 65#endif
66
66#include "cms_lcl.h" 67#include "cms_lcl.h"
67 68
68DECLARE_ASN1_ITEM(CMS_CompressedData) 69DECLARE_ASN1_ITEM(CMS_CompressedData)
diff --git a/src/lib/libcrypto/cms/cms_dd.c b/src/lib/libcrypto/cms/cms_dd.c
index 7b1fff889a..eee25f5f07 100644
--- a/src/lib/libcrypto/cms/cms_dd.c
+++ b/src/lib/libcrypto/cms/cms_dd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cms_dd.c,v 1.3 2014/06/12 15:49:28 deraadt Exp $ */ 1/* $OpenBSD: cms_dd.c,v 1.4 2014/07/11 08:44:48 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -51,12 +51,12 @@
51 * ==================================================================== 51 * ====================================================================
52 */ 52 */
53 53
54#include "cryptlib.h"
55#include <openssl/asn1t.h> 54#include <openssl/asn1t.h>
55#include <openssl/cms.h>
56#include <openssl/err.h>
56#include <openssl/pem.h> 57#include <openssl/pem.h>
57#include <openssl/x509v3.h> 58#include <openssl/x509v3.h>
58#include <openssl/err.h> 59
59#include <openssl/cms.h>
60#include "cms_lcl.h" 60#include "cms_lcl.h"
61 61
62DECLARE_ASN1_ITEM(CMS_DigestedData) 62DECLARE_ASN1_ITEM(CMS_DigestedData)
diff --git a/src/lib/libcrypto/cms/cms_enc.c b/src/lib/libcrypto/cms/cms_enc.c
index faa1b14d4b..efe19a3131 100644
--- a/src/lib/libcrypto/cms/cms_enc.c
+++ b/src/lib/libcrypto/cms/cms_enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cms_enc.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */ 1/* $OpenBSD: cms_enc.c,v 1.5 2014/07/11 08:44:48 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -51,13 +51,13 @@
51 * ==================================================================== 51 * ====================================================================
52 */ 52 */
53 53
54#include "cryptlib.h"
55#include <openssl/asn1t.h> 54#include <openssl/asn1t.h>
56#include <openssl/pem.h>
57#include <openssl/x509v3.h>
58#include <openssl/err.h>
59#include <openssl/cms.h> 55#include <openssl/cms.h>
56#include <openssl/err.h>
57#include <openssl/pem.h>
60#include <openssl/rand.h> 58#include <openssl/rand.h>
59#include <openssl/x509v3.h>
60
61#include "cms_lcl.h" 61#include "cms_lcl.h"
62 62
63/* CMS EncryptedData Utilities */ 63/* CMS EncryptedData Utilities */
diff --git a/src/lib/libcrypto/cms/cms_env.c b/src/lib/libcrypto/cms/cms_env.c
index 2dd4e2faba..66ec1a9343 100644
--- a/src/lib/libcrypto/cms/cms_env.c
+++ b/src/lib/libcrypto/cms/cms_env.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cms_env.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */ 1/* $OpenBSD: cms_env.c,v 1.6 2014/07/11 08:44:48 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -51,14 +51,14 @@
51 * ==================================================================== 51 * ====================================================================
52 */ 52 */
53 53
54#include "cryptlib.h" 54#include <openssl/aes.h>
55#include <openssl/asn1t.h> 55#include <openssl/asn1t.h>
56#include <openssl/pem.h>
57#include <openssl/x509v3.h>
58#include <openssl/err.h>
59#include <openssl/cms.h> 56#include <openssl/cms.h>
57#include <openssl/err.h>
58#include <openssl/pem.h>
60#include <openssl/rand.h> 59#include <openssl/rand.h>
61#include <openssl/aes.h> 60#include <openssl/x509v3.h>
61
62#include "cms_lcl.h" 62#include "cms_lcl.h"
63#include "asn1_locl.h" 63#include "asn1_locl.h"
64 64
diff --git a/src/lib/libcrypto/cms/cms_ess.c b/src/lib/libcrypto/cms/cms_ess.c
index f972ff3ee3..e3b7e7da4c 100644
--- a/src/lib/libcrypto/cms/cms_ess.c
+++ b/src/lib/libcrypto/cms/cms_ess.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cms_ess.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */ 1/* $OpenBSD: cms_ess.c,v 1.6 2014/07/11 08:44:48 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -51,13 +51,13 @@
51 * ==================================================================== 51 * ====================================================================
52 */ 52 */
53 53
54#include "cryptlib.h"
55#include <openssl/asn1t.h> 54#include <openssl/asn1t.h>
55#include <openssl/cms.h>
56#include <openssl/err.h>
56#include <openssl/pem.h> 57#include <openssl/pem.h>
57#include <openssl/rand.h> 58#include <openssl/rand.h>
58#include <openssl/x509v3.h> 59#include <openssl/x509v3.h>
59#include <openssl/err.h> 60
60#include <openssl/cms.h>
61#include "cms_lcl.h" 61#include "cms_lcl.h"
62 62
63DECLARE_ASN1_ITEM(CMS_ReceiptRequest) 63DECLARE_ASN1_ITEM(CMS_ReceiptRequest)
diff --git a/src/lib/libcrypto/cms/cms_pwri.c b/src/lib/libcrypto/cms/cms_pwri.c
index 04d0cb833f..ea3fbf87dd 100644
--- a/src/lib/libcrypto/cms/cms_pwri.c
+++ b/src/lib/libcrypto/cms/cms_pwri.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cms_pwri.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */ 1/* $OpenBSD: cms_pwri.c,v 1.6 2014/07/11 08:44:48 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -51,16 +51,16 @@
51 * ==================================================================== 51 * ====================================================================
52 */ 52 */
53 53
54#include "cryptlib.h" 54#include <openssl/aes.h>
55#include <openssl/asn1t.h> 55#include <openssl/asn1t.h>
56#include <openssl/pem.h>
57#include <openssl/x509v3.h>
58#include <openssl/err.h>
59#include <openssl/cms.h> 56#include <openssl/cms.h>
57#include <openssl/err.h>
58#include <openssl/pem.h>
60#include <openssl/rand.h> 59#include <openssl/rand.h>
61#include <openssl/aes.h> 60#include <openssl/x509v3.h>
62#include "cms_lcl.h" 61
63#include "asn1_locl.h" 62#include "asn1_locl.h"
63#include "cms_lcl.h"
64 64
65int 65int
66CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri, unsigned char *pass, 66CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri, unsigned char *pass,
diff --git a/src/lib/libcrypto/cms/cms_sd.c b/src/lib/libcrypto/cms/cms_sd.c
index 0993502a1d..63c3f69bae 100644
--- a/src/lib/libcrypto/cms/cms_sd.c
+++ b/src/lib/libcrypto/cms/cms_sd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cms_sd.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */ 1/* $OpenBSD: cms_sd.c,v 1.6 2014/07/11 08:44:48 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -51,14 +51,14 @@
51 * ==================================================================== 51 * ====================================================================
52 */ 52 */
53 53
54#include "cryptlib.h"
55#include <openssl/asn1t.h> 54#include <openssl/asn1t.h>
55#include <openssl/cms.h>
56#include <openssl/err.h>
56#include <openssl/pem.h> 57#include <openssl/pem.h>
57#include <openssl/x509v3.h> 58#include <openssl/x509v3.h>
58#include <openssl/err.h> 59
59#include <openssl/cms.h>
60#include "cms_lcl.h"
61#include "asn1_locl.h" 60#include "asn1_locl.h"
61#include "cms_lcl.h"
62 62
63/* CMS SignedData Utilities */ 63/* CMS SignedData Utilities */
64 64
diff --git a/src/lib/libcrypto/cms/cms_smime.c b/src/lib/libcrypto/cms/cms_smime.c
index 049ef69d38..4f80561e5d 100644
--- a/src/lib/libcrypto/cms/cms_smime.c
+++ b/src/lib/libcrypto/cms/cms_smime.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cms_smime.c,v 1.10 2014/06/12 15:49:28 deraadt Exp $ */ 1/* $OpenBSD: cms_smime.c,v 1.11 2014/07/11 08:44:48 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -51,12 +51,12 @@
51 * ==================================================================== 51 * ====================================================================
52 */ 52 */
53 53
54#include "cryptlib.h"
55#include <openssl/asn1t.h> 54#include <openssl/asn1t.h>
55#include <openssl/cms.h>
56#include <openssl/err.h>
56#include <openssl/x509.h> 57#include <openssl/x509.h>
57#include <openssl/x509v3.h> 58#include <openssl/x509v3.h>
58#include <openssl/err.h> 59
59#include <openssl/cms.h>
60#include "cms_lcl.h" 60#include "cms_lcl.h"
61 61
62static int 62static int
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-04 17:04:30 +0000