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_asn1.c4
-rw-r--r--src/lib/libcrypto/cms/cms_att.c4
-rw-r--r--src/lib/libcrypto/cms/cms_cd.c4
-rw-r--r--src/lib/libcrypto/cms/cms_dd.c4
-rw-r--r--src/lib/libcrypto/cms/cms_enc.c4
-rw-r--r--src/lib/libcrypto/cms/cms_env.c8
-rw-r--r--src/lib/libcrypto/cms/cms_ess.c4
-rw-r--r--src/lib/libcrypto/cms/cms_io.c4
-rw-r--r--src/lib/libcrypto/cms/cms_kari.c6
-rw-r--r--src/lib/libcrypto/cms/cms_lib.c6
-rw-r--r--src/lib/libcrypto/cms/cms_local.h (renamed from src/lib/libcrypto/cms/cms_lcl.h)2
-rw-r--r--src/lib/libcrypto/cms/cms_pwri.c6
-rw-r--r--src/lib/libcrypto/cms/cms_sd.c8
-rw-r--r--src/lib/libcrypto/cms/cms_smime.c6
14 files changed, 35 insertions, 35 deletions
diff --git a/src/lib/libcrypto/cms/cms_asn1.c b/src/lib/libcrypto/cms/cms_asn1.c
index cc00aef0fa..d6138f93aa 100644
--- a/src/lib/libcrypto/cms/cms_asn1.c
+++ b/src/lib/libcrypto/cms/cms_asn1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cms_asn1.c,v 1.19 2022/01/14 08:16:13 tb Exp $ */ 1/* $OpenBSD: cms_asn1.c,v 1.20 2022/11/26 16:08:51 tb 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.
@@ -56,7 +56,7 @@
56#include <openssl/pem.h> 56#include <openssl/pem.h>
57#include <openssl/x509v3.h> 57#include <openssl/x509v3.h>
58#include <openssl/cms.h> 58#include <openssl/cms.h>
59#include "cms_lcl.h" 59#include "cms_local.h"
60 60
61 61
62static const ASN1_TEMPLATE CMS_IssuerAndSerialNumber_seq_tt[] = { 62static const ASN1_TEMPLATE CMS_IssuerAndSerialNumber_seq_tt[] = {
diff --git a/src/lib/libcrypto/cms/cms_att.c b/src/lib/libcrypto/cms/cms_att.c
index b03c7437a4..0fb077f7d9 100644
--- a/src/lib/libcrypto/cms/cms_att.c
+++ b/src/lib/libcrypto/cms/cms_att.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cms_att.c,v 1.9 2019/08/10 18:15:52 jsing Exp $ */ 1/* $OpenBSD: cms_att.c,v 1.10 2022/11/26 16:08:51 tb 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.
@@ -57,7 +57,7 @@
57#include <openssl/x509v3.h> 57#include <openssl/x509v3.h>
58#include <openssl/err.h> 58#include <openssl/err.h>
59#include <openssl/cms.h> 59#include <openssl/cms.h>
60#include "cms_lcl.h" 60#include "cms_local.h"
61 61
62/* CMS SignedData Attribute utilities */ 62/* CMS SignedData Attribute utilities */
63 63
diff --git a/src/lib/libcrypto/cms/cms_cd.c b/src/lib/libcrypto/cms/cms_cd.c
index ec67cf11f7..3ecf801bc8 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.15 2019/08/11 11:04:18 jsing Exp $ */ 1/* $OpenBSD: cms_cd.c,v 1.16 2022/11/26 16:08:51 tb 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.
@@ -60,7 +60,7 @@
60#include <openssl/cms.h> 60#include <openssl/cms.h>
61#include <openssl/bio.h> 61#include <openssl/bio.h>
62#include <openssl/comp.h> 62#include <openssl/comp.h>
63#include "cms_lcl.h" 63#include "cms_local.h"
64 64
65#ifdef ZLIB 65#ifdef ZLIB
66 66
diff --git a/src/lib/libcrypto/cms/cms_dd.c b/src/lib/libcrypto/cms/cms_dd.c
index f1aafe39fe..a08fccc2a7 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.14 2019/08/11 11:04:18 jsing Exp $ */ 1/* $OpenBSD: cms_dd.c,v 1.15 2022/11/26 16:08:51 tb 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.
@@ -60,7 +60,7 @@
60#include <openssl/x509v3.h> 60#include <openssl/x509v3.h>
61#include <openssl/err.h> 61#include <openssl/err.h>
62#include <openssl/cms.h> 62#include <openssl/cms.h>
63#include "cms_lcl.h" 63#include "cms_local.h"
64 64
65/* CMS DigestedData Utilities */ 65/* CMS DigestedData Utilities */
66 66
diff --git a/src/lib/libcrypto/cms/cms_enc.c b/src/lib/libcrypto/cms/cms_enc.c
index ccbb6a5deb..06dffcbed4 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.21 2022/01/20 10:58:35 inoguchi Exp $ */ 1/* $OpenBSD: cms_enc.c,v 1.22 2022/11/26 16:08:51 tb 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.
@@ -61,7 +61,7 @@
61#include <openssl/err.h> 61#include <openssl/err.h>
62#include <openssl/cms.h> 62#include <openssl/cms.h>
63#include <openssl/rand.h> 63#include <openssl/rand.h>
64#include "cms_lcl.h" 64#include "cms_local.h"
65 65
66/* CMS EncryptedData Utilities */ 66/* CMS EncryptedData Utilities */
67 67
diff --git a/src/lib/libcrypto/cms/cms_env.c b/src/lib/libcrypto/cms/cms_env.c
index a88ea63662..1d534e3da5 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.24 2021/09/08 14:33:02 tb Exp $ */ 1/* $OpenBSD: cms_env.c,v 1.25 2022/11/26 16:08:51 tb 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.
@@ -61,9 +61,9 @@
61#include <openssl/err.h> 61#include <openssl/err.h>
62#include <openssl/cms.h> 62#include <openssl/cms.h>
63#include <openssl/aes.h> 63#include <openssl/aes.h>
64#include "cms_lcl.h" 64#include "cms_local.h"
65#include "asn1/asn1_locl.h" 65#include "asn1/asn1_local.h"
66#include "evp/evp_locl.h" 66#include "evp/evp_local.h"
67 67
68/* CMS EnvelopedData Utilities */ 68/* CMS EnvelopedData Utilities */
69 69
diff --git a/src/lib/libcrypto/cms/cms_ess.c b/src/lib/libcrypto/cms/cms_ess.c
index 9420405d8f..88ea6e96f6 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.21 2019/08/11 14:19:09 jsing Exp $ */ 1/* $OpenBSD: cms_ess.c,v 1.22 2022/11/26 16:08:51 tb 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.
@@ -61,7 +61,7 @@
61#include <openssl/x509v3.h> 61#include <openssl/x509v3.h>
62#include <openssl/err.h> 62#include <openssl/err.h>
63#include <openssl/cms.h> 63#include <openssl/cms.h>
64#include "cms_lcl.h" 64#include "cms_local.h"
65 65
66 66
67CMS_ReceiptRequest * 67CMS_ReceiptRequest *
diff --git a/src/lib/libcrypto/cms/cms_io.c b/src/lib/libcrypto/cms/cms_io.c
index 4466d6acf2..8a6b12e90f 100644
--- a/src/lib/libcrypto/cms/cms_io.c
+++ b/src/lib/libcrypto/cms/cms_io.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cms_io.c,v 1.11 2019/08/11 10:38:27 jsing Exp $ */ 1/* $OpenBSD: cms_io.c,v 1.12 2022/11/26 16:08:51 tb 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.
@@ -57,7 +57,7 @@
57#include <openssl/err.h> 57#include <openssl/err.h>
58#include <openssl/pem.h> 58#include <openssl/pem.h>
59#include <openssl/cms.h> 59#include <openssl/cms.h>
60#include "cms_lcl.h" 60#include "cms_local.h"
61 61
62int 62int
63CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms) 63CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms)
diff --git a/src/lib/libcrypto/cms/cms_kari.c b/src/lib/libcrypto/cms/cms_kari.c
index 21e3ce8254..0294007791 100644
--- a/src/lib/libcrypto/cms/cms_kari.c
+++ b/src/lib/libcrypto/cms/cms_kari.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cms_kari.c,v 1.13 2019/08/11 14:27:01 jsing Exp $ */ 1/* $OpenBSD: cms_kari.c,v 1.14 2022/11/26 16:08:51 tb 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.
@@ -61,8 +61,8 @@
61#include <openssl/err.h> 61#include <openssl/err.h>
62#include <openssl/cms.h> 62#include <openssl/cms.h>
63#include <openssl/aes.h> 63#include <openssl/aes.h>
64#include "cms_lcl.h" 64#include "cms_local.h"
65#include "asn1/asn1_locl.h" 65#include "asn1/asn1_local.h"
66 66
67/* Key Agreement Recipient Info (KARI) routines */ 67/* Key Agreement Recipient Info (KARI) routines */
68 68
diff --git a/src/lib/libcrypto/cms/cms_lib.c b/src/lib/libcrypto/cms/cms_lib.c
index 21adef7aec..ee9385910f 100644
--- a/src/lib/libcrypto/cms/cms_lib.c
+++ b/src/lib/libcrypto/cms/cms_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cms_lib.c,v 1.15 2021/11/01 20:53:08 tb Exp $ */ 1/* $OpenBSD: cms_lib.c,v 1.16 2022/11/26 16:08:51 tb 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.
@@ -60,8 +60,8 @@
60#include <openssl/asn1.h> 60#include <openssl/asn1.h>
61#include <openssl/cms.h> 61#include <openssl/cms.h>
62 62
63#include "cms_lcl.h" 63#include "cms_local.h"
64#include "x509_lcl.h" 64#include "x509_local.h"
65 65
66CMS_ContentInfo * 66CMS_ContentInfo *
67d2i_CMS_ContentInfo(CMS_ContentInfo **a, const unsigned char **in, long len) 67d2i_CMS_ContentInfo(CMS_ContentInfo **a, const unsigned char **in, long len)
diff --git a/src/lib/libcrypto/cms/cms_lcl.h b/src/lib/libcrypto/cms/cms_local.h
index 8083e5537d..29e8825b08 100644
--- a/src/lib/libcrypto/cms/cms_lcl.h
+++ b/src/lib/libcrypto/cms/cms_local.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: cms_lcl.h,v 1.12 2019/10/04 18:03:56 tb Exp $ */ 1/* $OpenBSD: cms_local.h,v 1.1 2022/11/26 16:08:51 tb 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.
diff --git a/src/lib/libcrypto/cms/cms_pwri.c b/src/lib/libcrypto/cms/cms_pwri.c
index eb241a60fe..3348b60fdc 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.27 2022/01/19 13:47:44 inoguchi Exp $ */ 1/* $OpenBSD: cms_pwri.c,v 1.28 2022/11/26 16:08:51 tb 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.
@@ -62,8 +62,8 @@
62#include <openssl/cms.h> 62#include <openssl/cms.h>
63#include <openssl/rand.h> 63#include <openssl/rand.h>
64#include <openssl/aes.h> 64#include <openssl/aes.h>
65#include "cms_lcl.h" 65#include "cms_local.h"
66#include "asn1/asn1_locl.h" 66#include "asn1/asn1_local.h"
67 67
68int 68int
69CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri, unsigned char *pass, 69CMS_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 29dbfb2d19..8df78fe3e5 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.24 2022/08/28 18:27:47 tb Exp $ */ 1/* $OpenBSD: cms_sd.c,v 1.25 2022/11/26 16:08:51 tb 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.
@@ -61,9 +61,9 @@
61#include <openssl/x509v3.h> 61#include <openssl/x509v3.h>
62#include <openssl/err.h> 62#include <openssl/err.h>
63#include <openssl/cms.h> 63#include <openssl/cms.h>
64#include "cms_lcl.h" 64#include "cms_local.h"
65#include "asn1/asn1_locl.h" 65#include "asn1/asn1_local.h"
66#include "evp/evp_locl.h" 66#include "evp/evp_local.h"
67 67
68/* CMS SignedData Utilities */ 68/* CMS SignedData Utilities */
69 69
diff --git a/src/lib/libcrypto/cms/cms_smime.c b/src/lib/libcrypto/cms/cms_smime.c
index 367810f40e..d21ff124d7 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.24 2019/10/04 18:03:56 tb Exp $ */ 1/* $OpenBSD: cms_smime.c,v 1.25 2022/11/26 16:08:51 tb 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.
@@ -58,8 +58,8 @@
58#include <openssl/x509v3.h> 58#include <openssl/x509v3.h>
59#include <openssl/err.h> 59#include <openssl/err.h>
60#include <openssl/cms.h> 60#include <openssl/cms.h>
61#include "cms_lcl.h" 61#include "cms_local.h"
62#include "asn1/asn1_locl.h" 62#include "asn1/asn1_local.h"
63 63
64static BIO * 64static BIO *
65cms_get_text_bio(BIO *out, unsigned int flags) 65cms_get_text_bio(BIO *out, unsigned int flags)
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-20 05:35:36 +0000