summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/cms/cms_lib.c
diff options
context:
space:
mode:
authortb <>2021-11-01 20:53:08 +0000
committertb <>2021-11-01 20:53:08 +0000
commitb1d784eb6c4f1df06e96cfc40e2434cf76165cbe (patch)
treecbf2de4e6ef2a9e9d9281e6e60c30149cd648fd1 /src/lib/libcrypto/cms/cms_lib.c
parent95589e2e9b8cb0aa7ceb0bdf1ad9af358f6564db (diff)
downloadopenbsd-b1d784eb6c4f1df06e96cfc40e2434cf76165cbe.tar.gz
openbsd-b1d784eb6c4f1df06e96cfc40e2434cf76165cbe.tar.bz2
openbsd-b1d784eb6c4f1df06e96cfc40e2434cf76165cbe.zip
Move the now internal X.509-related structs into x509_lcl.h.
Garbage collect the now unused LIBRESSL_CRYPTO_INTERNAL and LIBRESSL_OPAQUE_X509. Include "x509_lcl.h" where needed and fix a couple of unnecessary reacharounds. ok jsing
Diffstat (limited to 'src/lib/libcrypto/cms/cms_lib.c')
-rw-r--r--src/lib/libcrypto/cms/cms_lib.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libcrypto/cms/cms_lib.c b/src/lib/libcrypto/cms/cms_lib.c
index b6580dd6f5..21adef7aec 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.14 2019/08/12 18:13:13 jsing Exp $ */ 1/* $OpenBSD: cms_lib.c,v 1.15 2021/11/01 20:53:08 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.
@@ -59,8 +59,9 @@
59#include <openssl/bio.h> 59#include <openssl/bio.h>
60#include <openssl/asn1.h> 60#include <openssl/asn1.h>
61#include <openssl/cms.h> 61#include <openssl/cms.h>
62#include "cms_lcl.h"
63 62
63#include "cms_lcl.h"
64#include "x509_lcl.h"
64 65
65CMS_ContentInfo * 66CMS_ContentInfo *
66d2i_CMS_ContentInfo(CMS_ContentInfo **a, const unsigned char **in, long len) 67d2i_CMS_ContentInfo(CMS_ContentInfo **a, const unsigned char **in, long len)