New utility functions for encryptedData content type which will also be used (5c4436c9) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

crypto/cms/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,9 +18,9 @@ APPS=

		LIB=$(TOP)/libcrypto.a
		LIBSRC= cms_lib.c cms_asn1.c cms_att.c cms_io.c cms_smime.c cms_err.c \
		cms_sd.c cms_dd.c cms_cd.c cms_env.c
		cms_sd.c cms_dd.c cms_cd.c cms_env.c cms_enc.c
		LIBOBJ= cms_lib.o cms_asn1.o cms_att.o cms_io.o cms_smime.o cms_err.o \
		cms_sd.o cms_dd.o cms_cd.o cms_env.o
		cms_sd.o cms_dd.o cms_cd.o cms_env.o cms_enc.o

		SRC= $(LIBSRC)

crypto/cms/cms.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -241,6 +241,7 @@ void ERR_load_CMS_strings(void);
		#define CMS_F_CMS_ADD1_RECIPIENT_CERT 99
		#define CMS_F_CMS_ADD1_SIGNER 100
		#define CMS_F_CMS_ADD1_SIGNINGTIME 101
		#define CMS_F_CMS_BIO_TO_ENCRYPTEDCONTENT 137
		#define CMS_F_CMS_COMPRESS 102
		#define CMS_F_CMS_COMPRESSEDDATA_CREATE 103
		#define CMS_F_CMS_COMPRESSEDDATA_INIT_BIO 104
		@@ -253,6 +254,7 @@ void ERR_load_CMS_strings(void);
		#define CMS_F_CMS_DIGESTALGORITHM_INIT_BIO 111
		#define CMS_F_CMS_DIGESTEDDATA_DO_FINAL 112
		#define CMS_F_CMS_DIGEST_VERIFY 113
		#define CMS_F_CMS_ENCRYPTEDCONTENT_TO_BIO 138
		#define CMS_F_CMS_ENVELOPED_DATA_INIT 114
		#define CMS_F_CMS_FINAL 115
		#define CMS_F_CMS_GET0_CERTIFICATE_CHOICES 116
		@@ -280,6 +282,8 @@ void ERR_load_CMS_strings(void);
		/* Reason codes. */
		#define CMS_R_ADD_SIGNER_ERROR 99
		#define CMS_R_CERTIFICATE_VERIFY_ERROR 100
		#define CMS_R_CIPHER_INITIALISATION_ERROR 138
		#define CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR 139
		#define CMS_R_CMS_DATAFINAL_ERROR 101
		#define CMS_R_CONTENT_NOT_FOUND 102
		#define CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA 103
		@@ -290,6 +294,7 @@ void ERR_load_CMS_strings(void);
		#define CMS_R_CTRL_FAILURE 108
		#define CMS_R_ERROR_GETTING_PUBLIC_KEY 109
		#define CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE 110
		#define CMS_R_INVALID_KEY_LENGTH 140
		#define CMS_R_MD_BIO_INIT_ERROR 111
		#define CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH 112
		#define CMS_R_MESSAGEDIGEST_WRONG_LENGTH 113
		@@ -311,6 +316,7 @@ void ERR_load_CMS_strings(void);
		#define CMS_R_TYPE_NOT_DATA 129
		#define CMS_R_TYPE_NOT_DIGESTED_DATA 130
		#define CMS_R_UNABLE_TO_FINALIZE_CONTEXT 131
		#define CMS_R_UNKNOWN_CIPHER 141
		#define CMS_R_UNKNOWN_DIGEST_ALGORIHM 132
		#define CMS_R_UNKNOWN_ID 133
		#define CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM 134

crypto/cms/cms_asn1.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -216,7 +216,7 @@ ASN1_SEQUENCE(CMS_OtherRecipientInfo) = {
		static int cms_ri_cb(int operation, ASN1_VALUE *pval, const ASN1_ITEM it,
		void *exarg)
		{
		if(operation == ASN1_OP_FREE_POST)
		if(operation == ASN1_OP_FREE_PRE)
		{
		CMS_RecipientInfo ri = (CMS_RecipientInfo )*pval;
		if (ri->type == CMS_RECIPINFO_TRANS)

crypto/cms/cms_enc.c

0 → 100644

+196 −0

Original line number	Diff line number	Diff line
		/* crypto/cms/cms_enc.c */
		/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
		* project.
		*/
		/* ====================================================================
		* Copyright (c) 2008 The OpenSSL Project. All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		*
		* 1. Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		*
		* 2. Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in
		* the documentation and/or other materials provided with the
		* distribution.
		*
		* 3. All advertising materials mentioning features or use of this
		* software must display the following acknowledgment:
		* "This product includes software developed by the OpenSSL Project
		* for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
		*
		* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
		* endorse or promote products derived from this software without
		* prior written permission. For written permission, please contact
		* licensing@OpenSSL.org.
		*
		* 5. Products derived from this software may not be called "OpenSSL"
		* nor may "OpenSSL" appear in their names without prior written
		* permission of the OpenSSL Project.
		*
		* 6. Redistributions of any form whatsoever must retain the following
		* acknowledgment:
		* "This product includes software developed by the OpenSSL Project
		* for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
		*
		* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
		* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
		* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
		* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
		* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
		* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
		* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
		* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
		* OF THE POSSIBILITY OF SUCH DAMAGE.
		* ====================================================================
		*/

		#include "cryptlib.h"
		#include <openssl/asn1t.h>
		#include <openssl/pem.h>
		#include <openssl/x509v3.h>
		#include <openssl/err.h>
		#include <openssl/cms.h>
		#include <openssl/rand.h>
		#include "cms_lcl.h"
		#include "asn1_locl.h"

		/* CMS EncryptedData Utilities */

		/* Set up EncryptedContentInfo based on supplied cipher bio */

		int cms_bio_to_EncryptedContent(CMS_EncryptedContentInfo *ec,
		const unsigned char *key, int keylen,
		BIO *b)
		{
		EVP_CIPHER_CTX *ctx = NULL;
		unsigned char iv[EVP_MAX_IV_LENGTH], *piv;
		int ivlen;

		BIO_get_cipher_ctx(b, &ctx);

		/* If necessary set key length */

		if (keylen != EVP_CIPHER_CTX_key_length(ctx))
		{
		if (EVP_CIPHER_CTX_set_key_length(ctx, keylen) <= 0)
		{
		CMSerr(CMS_F_CMS_BIO_TO_ENCRYPTEDCONTENT,
		CMS_R_INVALID_KEY_LENGTH);
		return 0;
		}
		}

		/* Generate a random IV if we need one */

		ivlen = EVP_CIPHER_CTX_iv_length(ctx);
		if (ivlen > 0)
		{
		if (RAND_pseudo_bytes(iv, ivlen) <= 0)
		return 0;
		piv = iv;
		}
		else
		piv = NULL;

		if (EVP_CipherInit_ex(ctx, NULL, NULL, key, piv, 1) <= 0)
		{
		CMSerr(CMS_F_CMS_BIO_TO_ENCRYPTEDCONTENT,
		CMS_R_CIPHER_INITIALISATION_ERROR);
		return 0;
		}

		ec->contentEncryptionAlgorithm->algorithm =
		OBJ_nid2obj(EVP_CIPHER_CTX_type(ctx));

		if (piv)
		{
		ec->contentEncryptionAlgorithm->parameter = ASN1_TYPE_new();
		if (!ec->contentEncryptionAlgorithm->parameter)
		{
		CMSerr(CMS_F_CMS_BIO_TO_ENCRYPTEDCONTENT,
		ERR_R_MALLOC_FAILURE);
		return 0;
		}
		if (EVP_CIPHER_param_to_asn1(ctx,
		ec->contentEncryptionAlgorithm->parameter) <= 0)
		{
		CMSerr(CMS_F_CMS_BIO_TO_ENCRYPTEDCONTENT,
		CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR);
		return 0;
		}
		}

		return 1;
		}

		/* Return BIO based on EncryptedContentInfo and key */

		BIO cms_EncryptedContent_to_bio(CMS_EncryptedContentInfo ec,
		const unsigned char *key, int keylen)
		{
		BIO *b;
		EVP_CIPHER_CTX *ctx;
		const EVP_CIPHER *ciph;
		b = BIO_new(BIO_f_cipher());
		if (!b)
		{
		CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_TO_BIO, ERR_R_MALLOC_FAILURE);
		return NULL;
		}
		BIO_get_cipher_ctx(b, &ctx);

		ciph = EVP_get_cipherbyobj(ec->contentEncryptionAlgorithm->algorithm);

		if (!ciph)
		{
		CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_TO_BIO, CMS_R_UNKNOWN_CIPHER);
		goto err;
		}

		if (EVP_CipherInit_ex(ctx, ciph, NULL, NULL, NULL, 0) <= 0)
		{
		CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_TO_BIO,
		CMS_R_CIPHER_INITIALISATION_ERROR);
		goto err;
		}

		/* If necessary set key length */

		if (keylen != EVP_CIPHER_CTX_key_length(ctx))
		{
		if (EVP_CIPHER_CTX_set_key_length(ctx, keylen) <= 0)
		{
		CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_TO_BIO,
		CMS_R_INVALID_KEY_LENGTH);
		goto err;
		}
		}

		if (EVP_CipherInit_ex(ctx, NULL, NULL, key, NULL, 0) <= 0)
		{
		CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_TO_BIO,
		CMS_R_CIPHER_INITIALISATION_ERROR);
		goto err;
		}

		if (EVP_CIPHER_asn1_to_param(ctx,
		ec->contentEncryptionAlgorithm->parameter) <= 0)
		{
		CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_TO_BIO,
		CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR);
		goto err;
		}
		return b;

		err:
		BIO_free(b);
		return NULL;
		}

crypto/cms/cms_env.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@
		#include <openssl/x509v3.h>
		#include <openssl/err.h>
		#include <openssl/cms.h>
		#include <openssl/rand.h>
		#include "cms_lcl.h"
		#include "asn1_locl.h"

		@@ -66,12 +67,6 @@ DECLARE_ASN1_ITEM(CMS_EnvelopedData)
		DECLARE_ASN1_ITEM(CMS_RecipientInfo)
		DECLARE_ASN1_ITEM(CMS_KeyTransRecipientInfo)

		#if 0
		IMPLEMENT_ASN1_ALLOC_FUNCTIONS(CMS_EnvelopedData)
		IMPLEMENT_ASN1_ALLOC_FUNCTIONS(CMS_RecipientInfo)
		IMPLEMENT_ASN1_ALLOC_FUNCTIONS(CMS_KeyTransRecipientInfo)
		#endif

		DECLARE_STACK_OF(CMS_RecipientInfo)

		static CMS_EnvelopedData cms_get0_enveloped(CMS_ContentInfo cms)

Admin message