Commit 174b07be authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 2744 

Submitted by: Dmitry Belyavsky <beldmit@gmail.com>

CMS support for ccgost engine
parent 15a40af2

engines/ccgost/gost_ameth.c

+37 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ 
#include <openssl/engine.h>

#include <openssl/evp.h>

#include <openssl/asn1.h>

#ifndef OPENSSL_NO_CMS

#include <openssl/cms.h>

#endif

#include "gost_params.h"

#include "gost_lcl.h"

#include "e_gost_err.h"
@@ -230,6 +233,24 @@ static int pkey_ctrl_gost(EVP_PKEY *pkey, int op, 
				X509_ALGOR_set0(alg2, OBJ_nid2obj(nid), V_ASN1_NULL, 0);

				}

			return 1;

#ifndef OPENSSL_NO_CMS

		case ASN1_PKEY_CTRL_CMS_SIGN:

			if (arg1 == 0) 

				{

				X509_ALGOR *alg1 = NULL, *alg2 = NULL;

				int nid = EVP_PKEY_base_id(pkey);

				CMS_SignerInfo_get0_algs((CMS_SignerInfo *)arg2, 

					NULL, NULL, &alg1, &alg2);

				X509_ALGOR_set0(alg1, OBJ_nid2obj(NID_id_GostR3411_94),

					V_ASN1_NULL, 0);

				if (nid == NID_undef) 

					{

					return (-1);

					}

				X509_ALGOR_set0(alg2, OBJ_nid2obj(nid), V_ASN1_NULL, 0);

				}

			return 1;

#endif

		case ASN1_PKEY_CTRL_PKCS7_ENCRYPT:

			if (arg1 == 0)

				{
@@ -244,6 +265,22 @@ static int pkey_ctrl_gost(EVP_PKEY *pkey, int op, 
					V_ASN1_SEQUENCE, params);

				}

			return 1;

#ifndef OPENSSL_NO_CMS

		case ASN1_PKEY_CTRL_CMS_ENVELOPE:

			if (arg1 == 0)

				{

				X509_ALGOR *alg;

				ASN1_STRING * params = encode_gost_algor_params(pkey);

				if (!params) 

					{

					return -1;

					}

				CMS_RecipientInfo_ktri_get0_algs((CMS_RecipientInfo *)arg2, NULL, NULL, &alg);

				X509_ALGOR_set0(alg, OBJ_nid2obj(pkey->type),

					V_ASN1_SEQUENCE, params);

				}

			return 1;

#endif

		case ASN1_PKEY_CTRL_DEFAULT_MD_NID:

			*(int *)arg2 = NID_id_GostR3411_94;

			return 2;

engines/ccgost/gost_pmeth.c

+6 −0
Original line number Diff line number Diff line
@@ -89,6 +89,12 @@ static int pkey_gost_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) 
		case EVP_PKEY_CTRL_PKCS7_ENCRYPT:

		case EVP_PKEY_CTRL_PKCS7_DECRYPT:

		case EVP_PKEY_CTRL_PKCS7_SIGN:

		case EVP_PKEY_CTRL_DIGESTINIT:

#ifndef OPENSSL_NO_CMS		

		case EVP_PKEY_CTRL_CMS_ENCRYPT:

		case EVP_PKEY_CTRL_CMS_DECRYPT:

		case EVP_PKEY_CTRL_CMS_SIGN:

#endif		

			return 1;



		case EVP_PKEY_CTRL_GOST_PARAMSET: