Signed Receipt Request utility functions and option on CMS utility to (f4cc56f4) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

apps/cms.c

+78 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,7 @@
		#define PROG cms_main
		static int save_certs(char signerfile, STACK_OF(X509) signers);
		static int smime_cb(int ok, X509_STORE_CTX *ctx);
		static void receipt_request_print(BIO out, CMS_ContentInfo cms);

		#define SMIME_OP 0x10
		#define SMIME_IP 0x20
		@@ -111,6 +112,7 @@ int MAIN(int argc, char **argv)
		BIO in = NULL, out = NULL, *indata = NULL;
		int badarg = 0;
		int flags = CMS_DETACHED, noout = 0, print = 0;
		int rr_print = 0;
		char to = NULL, from = NULL, *subject = NULL;
		char CAfile = NULL, CApath = NULL;
		char passargin = NULL, passin = NULL;
		@@ -244,6 +246,8 @@ int MAIN(int argc, char **argv)
		flags \|= CMS_CRLFEOL;
		else if (!strcmp (*args, "-noout"))
		noout = 1;
		else if (!strcmp (*args, "-receipt_request_print"))
		rr_print = 1;
		else if (!strcmp (*args, "-print"))
		{
		noout = 1;
		@@ -939,6 +943,9 @@ int MAIN(int argc, char **argv)
		}
		sk_X509_free(signers);
		}
		if (rr_print)
		receipt_request_print(bio_err, cms);

		}
		else
		{
		@@ -1041,4 +1048,75 @@ static int smime_cb(int ok, X509_STORE_CTX *ctx)

		}

		static void gnames_stack_print(BIO out, STACK_OF(GENERAL_NAMES) gns)
		{
		STACK_OF(GENERAL_NAME) *gens;
		GENERAL_NAME *gen;
		int i, j;
		for (i = 0; i < sk_GENERAL_NAMES_num(gns); i++)
		{
		gens = sk_GENERAL_NAMES_value(gns, i);
		for (j = 0; j < sk_GENERAL_NAME_num(gens); j++)
		{
		gen = sk_GENERAL_NAME_value(gens, j);
		BIO_puts(out, " ");
		GENERAL_NAME_print(out, gen);
		BIO_puts(out, "\n");
		}
		}
		return;
		}

		static void receipt_request_print(BIO out, CMS_ContentInfo cms)
		{
		STACK_OF(CMS_SignerInfo) *sis;
		CMS_SignerInfo *si;
		CMS_ReceiptRequest *rr;
		int allorfirst;
		STACK_OF(GENERAL_NAMES) rto, rlist;
		ASN1_STRING *scid;
		int i, rv;
		sis = CMS_get0_SignerInfos(cms);
		for (i = 0; i < sk_CMS_SignerInfo_num(sis); i++)
		{
		si = sk_CMS_SignerInfo_value(sis, i);
		rv = CMS_get1_ReceiptRequest(si, &rr);
		BIO_printf(bio_err, "Signer %d:\n", i + 1);
		if (rv == 0)
		BIO_puts(bio_err, " No Receipt Request\n");
		else if (rv < 0)
		{
		BIO_puts(bio_err, " Receipt Request Parse Error\n");
		ERR_print_errors(bio_err);
		}
		else
		{
		char *id;
		int idlen;
		CMS_ReceiptRequest_get0_values(rr, &scid, &allorfirst,
		&rlist, &rto);
		BIO_puts(out, " Signed Content ID:\n");
		idlen = ASN1_STRING_length(scid);
		id = (char *)ASN1_STRING_data(scid);
		BIO_dump_indent(out, id, idlen, 4);
		BIO_puts(out, " Receipts From");
		if (rlist)
		{
		BIO_puts(out, " List:\n");
		gnames_stack_print(out, rlist);
		}
		else if (allorfirst == 1)
		BIO_puts(out, ": First Tier\n");
		else if (allorfirst == 0)
		BIO_puts(out, ": All\n");
		else
		BIO_printf(out, " Unknown (%d)\n", allorfirst);
		BIO_puts(out, " Receipts To:\n");
		gnames_stack_print(out, rto);
		}
		if (rr)
		CMS_ReceiptRequest_free(rr);
		}
		}

		#endif

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_enc.c
		cms_sd.c cms_dd.c cms_cd.c cms_env.c cms_enc.c cms_ess.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_enc.o
		cms_sd.o cms_dd.o cms_cd.o cms_env.o cms_enc.o cms_ess.o

		SRC= $(LIBSRC)

crypto/cms/cms.h

+19 −0

Original line number	Diff line number	Diff line
		@@ -75,7 +75,9 @@ typedef struct CMS_ReceiptRequest_st CMS_ReceiptRequest;
		typedef struct CMS_Receipt_st CMS_Receipt;

		DECLARE_STACK_OF(CMS_SignerInfo)
		DECLARE_STACK_OF(GENERAL_NAMES)
		DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo)
		DECLARE_ASN1_FUNCTIONS(CMS_ReceiptRequest)
		DECLARE_ASN1_PRINT_FUNCTION(CMS_ContentInfo)

		#define CMS_SIGNERINFO_ISSUER_SERIAL 0
		@@ -283,6 +285,22 @@ int CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si,
		void CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo si, ASN1_OBJECT *oid,
		int lastpos, int type);

		#ifdef HEADER_X509V3_H

		int CMS_get1_ReceiptRequest(CMS_SignerInfo si, CMS_ReceiptRequest *prr);
		int CMS_add1_ReceiptRequest(CMS_SignerInfo *si,
		unsigned char *id, int idlen,
		int allorfirst,
		STACK_OF(GENERAL_NAMES) *receiptList,
		STACK_OF(GENERAL_NAMES) *receiptsTo);
		void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr,
		ASN1_STRING **pcid,
		int *pallorfirst,
		STACK_OF(GENERAL_NAMES) **plist,
		STACK_OF(GENERAL_NAMES) **prto);

		#endif

		/* BEGIN ERROR CODES */
		/* The following lines are auto generated by the script mkerr.pl. Any changes
		* made after this point may be overwritten when the script is next run.
		@@ -294,6 +312,7 @@ void ERR_load_CMS_strings(void);
		/* Function codes. */
		#define CMS_F_CHECK_CONTENT 99
		#define CMS_F_CMS_ADD0_RECIPIENT_KEY 100
		#define CMS_F_CMS_ADD1_RECEIPTREQUEST 158
		#define CMS_F_CMS_ADD1_RECIPIENT_CERT 101
		#define CMS_F_CMS_ADD1_SIGNER 102
		#define CMS_F_CMS_ADD1_SIGNINGTIME 103

crypto/cms/cms_asn1.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -362,11 +362,12 @@ ASN1_ITEM_TEMPLATE_END(CMS_Attributes_Verify)

		ASN1_CHOICE(CMS_ReceiptsFrom) = {
		ASN1_IMP(CMS_ReceiptsFrom, d.allOrFirstTier, LONG, 0),
		ASN1_IMP_SEQUENCE_OF(CMS_ReceiptsFrom, d.receiptList, GENERAL_NAME, 1)
		ASN1_IMP_SEQUENCE_OF(CMS_ReceiptsFrom, d.receiptList, GENERAL_NAMES, 1)
		} ASN1_CHOICE_END(CMS_ReceiptsFrom)

		ASN1_SEQUENCE(CMS_ReceiptRequest) = {
		ASN1_SIMPLE(CMS_ReceiptRequest, signedContentIdentifier, ASN1_OCTET_STRING),
		ASN1_SIMPLE(CMS_ReceiptRequest, receiptsFrom, CMS_ReceiptsFrom)
		ASN1_SIMPLE(CMS_ReceiptRequest, receiptsFrom, CMS_ReceiptsFrom),
		ASN1_SEQUENCE_OF(CMS_ReceiptRequest, receiptsTo, GENERAL_NAMES)
		} ASN1_SEQUENCE_END(CMS_ReceiptRequest)

crypto/cms/cms_err.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@ static ERR_STRING_DATA CMS_str_functs[]=
		{
		{ERR_FUNC(CMS_F_CHECK_CONTENT), "CHECK_CONTENT"},
		{ERR_FUNC(CMS_F_CMS_ADD0_RECIPIENT_KEY), "CMS_add0_recipient_key"},
		{ERR_FUNC(CMS_F_CMS_ADD1_RECEIPTREQUEST), "CMS_ADD1_RECEIPTREQUEST"},
		{ERR_FUNC(CMS_F_CMS_ADD1_RECIPIENT_CERT), "CMS_add1_recipient_cert"},
		{ERR_FUNC(CMS_F_CMS_ADD1_SIGNER), "CMS_add1_signer"},
		{ERR_FUNC(CMS_F_CMS_ADD1_SIGNINGTIME), "CMS_ADD1_SIGNINGTIME"},