diff options
author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-03-16 16:41:52 +0100 |
---|---|---|
committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-04-28 14:10:47 +0200 |
commit | 4189dc3782c5989dbaa7d247e41a96a25b27c940 (patch) | |
tree | 1da5209296b9f40a026fbdefc4ab906b52a552dd /include | |
parent | 176a9a682a22d556037b0a959911e6020c8d2ecd (diff) |
CMS ESS: Move four internal aux function to where they belong in crypto/cms
Also constify and slightly refactor them.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14601)
Diffstat (limited to 'include')
-rw-r--r-- | include/crypto/cms.h | 27 | ||||
-rw-r--r-- | include/openssl/ess.h.in | 6 |
2 files changed, 2 insertions, 31 deletions
diff --git a/include/crypto/cms.h b/include/crypto/cms.h deleted file mode 100644 index fe1aed0c09..0000000000 --- a/include/crypto/cms.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the Apache License 2.0 (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy - * in the file LICENSE in the source distribution or at - * https://www.openssl.org/source/license.html - */ - -#ifndef OSSL_CRYPTO_CMS_H -# define OSSL_CRYPTO_CMS_H -# pragma once - -# ifndef OPENSSL_NO_CMS - -/* internal CMS-ESS related stuff */ - -int ossl_cms_add1_signing_cert(CMS_SignerInfo *si, ESS_SIGNING_CERT *sc); -int ossl_cms_add1_signing_cert_v2(CMS_SignerInfo *si, ESS_SIGNING_CERT_V2 *sc); - -int ossl_cms_signerinfo_get_signing_cert_v2(const CMS_SignerInfo *si, - ESS_SIGNING_CERT_V2 **psc); -int ossl_cms_signerinfo_get_signing_cert(const CMS_SignerInfo *si, - ESS_SIGNING_CERT **psc); -# endif /* OPENSSL_NO_CMS */ - -#endif diff --git a/include/openssl/ess.h.in b/include/openssl/ess.h.in index c35d8ef82d..d1a685b98e 100644 --- a/include/openssl/ess.h.in +++ b/include/openssl/ess.h.in @@ -52,16 +52,14 @@ DECLARE_ASN1_ALLOC_FUNCTIONS(ESS_CERT_ID) DECLARE_ASN1_ENCODE_FUNCTIONS_only(ESS_CERT_ID, ESS_CERT_ID) DECLARE_ASN1_DUP_FUNCTION(ESS_CERT_ID) -DECLARE_ASN1_ALLOC_FUNCTIONS(ESS_SIGNING_CERT) -DECLARE_ASN1_ENCODE_FUNCTIONS_only(ESS_SIGNING_CERT, ESS_SIGNING_CERT) +DECLARE_ASN1_FUNCTIONS(ESS_SIGNING_CERT) DECLARE_ASN1_DUP_FUNCTION(ESS_SIGNING_CERT) DECLARE_ASN1_ALLOC_FUNCTIONS(ESS_CERT_ID_V2) DECLARE_ASN1_ENCODE_FUNCTIONS_only(ESS_CERT_ID_V2, ESS_CERT_ID_V2) DECLARE_ASN1_DUP_FUNCTION(ESS_CERT_ID_V2) -DECLARE_ASN1_ALLOC_FUNCTIONS(ESS_SIGNING_CERT_V2) -DECLARE_ASN1_ENCODE_FUNCTIONS_only(ESS_SIGNING_CERT_V2, ESS_SIGNING_CERT_V2) +DECLARE_ASN1_FUNCTIONS(ESS_SIGNING_CERT_V2) DECLARE_ASN1_DUP_FUNCTION(ESS_SIGNING_CERT_V2) ESS_SIGNING_CERT *OSSL_ESS_signing_cert_new_init(const X509 *signcert, |