diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2019-11-01 15:15:36 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2019-11-01 15:15:36 +0000 |
| commit | 85a500e5debe57eaaef08ba448d55f25b60c4cfb (patch) | |
| tree | f539b1ff883dff5dbc370d13cfc4dc098d76173c | |
| parent | 98116ed23d7f1193c9824e7c861bf257056d3aca (diff) | |
Add DSA CMS support.
From OpenSSL 1.1.1d.
ok tb@
| -rw-r--r-- | lib/libcrypto/dsa/dsa_ameth.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/lib/libcrypto/dsa/dsa_ameth.c b/lib/libcrypto/dsa/dsa_ameth.c index 85ef234bb9f..cfb33237ec4 100644 --- a/lib/libcrypto/dsa/dsa_ameth.c +++ b/lib/libcrypto/dsa/dsa_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_ameth.c,v 1.27 2019/01/20 01:56:59 tb Exp $ */ +/* $OpenBSD: dsa_ameth.c,v 1.28 2019/11/01 15:15:35 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -62,6 +62,7 @@ #include <openssl/asn1.h> #include <openssl/bn.h> +#include <openssl/cms.h> #include <openssl/dsa.h> #include <openssl/err.h> #include <openssl/x509.h> @@ -604,6 +605,29 @@ dsa_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2) } return 1; +#ifndef OPENSSL_NO_CMS + case ASN1_PKEY_CTRL_CMS_SIGN: + if (arg1 == 0) { + int snid, hnid; + X509_ALGOR *alg1, *alg2; + + CMS_SignerInfo_get0_algs(arg2, NULL, NULL, &alg1, &alg2); + if (alg1 == NULL || alg1->algorithm == NULL) + return -1; + hnid = OBJ_obj2nid(alg1->algorithm); + if (hnid == NID_undef) + return -1; + if (!OBJ_find_sigid_by_algs(&snid, hnid, EVP_PKEY_id(pkey))) + return -1; + X509_ALGOR_set0(alg2, OBJ_nid2obj(snid), V_ASN1_UNDEF, 0); + } + return 1; + + case ASN1_PKEY_CTRL_CMS_RI_TYPE: + *(int *)arg2 = CMS_RECIPINFO_NONE; + return 1; +#endif + case ASN1_PKEY_CTRL_DEFAULT_MD_NID: *(int *)arg2 = NID_sha1; return 2; |