diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/gost/gostr341001_ameth.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/lib/libcrypto/gost/gostr341001_ameth.c b/src/lib/libcrypto/gost/gostr341001_ameth.c index 3153d2f2eb..bb569ea846 100644 --- a/src/lib/libcrypto/gost/gostr341001_ameth.c +++ b/src/lib/libcrypto/gost/gostr341001_ameth.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: gostr341001_ameth.c,v 1.9 2015/02/14 06:40:04 jsing Exp $ */ | 1 | /* $OpenBSD: gostr341001_ameth.c,v 1.10 2016/10/19 16:49:11 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 3 | * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> |
4 | * Copyright (c) 2005-2006 Cryptocom LTD | 4 | * Copyright (c) 2005-2006 Cryptocom LTD |
@@ -61,9 +61,6 @@ | |||
61 | #include <openssl/x509.h> | 61 | #include <openssl/x509.h> |
62 | #include <openssl/gost.h> | 62 | #include <openssl/gost.h> |
63 | 63 | ||
64 | #ifndef OPENSSL_NO_CMS | ||
65 | #include <openssl/cms.h> | ||
66 | #endif | ||
67 | 64 | ||
68 | #include "asn1_locl.h" | 65 | #include "asn1_locl.h" |
69 | #include "gost_locl.h" | 66 | #include "gost_locl.h" |
@@ -656,17 +653,6 @@ pkey_ctrl_gost01(EVP_PKEY *pkey, int op, long arg1, void *arg2) | |||
656 | if (arg1 == 0) | 653 | if (arg1 == 0) |
657 | PKCS7_RECIP_INFO_get0_alg(arg2, &alg3); | 654 | PKCS7_RECIP_INFO_get0_alg(arg2, &alg3); |
658 | break; | 655 | break; |
659 | #ifndef OPENSSL_NO_CMS | ||
660 | case ASN1_PKEY_CTRL_CMS_SIGN: | ||
661 | if (arg1 == 0) | ||
662 | CMS_SignerInfo_get0_algs(arg2, NULL, NULL, &alg1, &alg2); | ||
663 | break; | ||
664 | |||
665 | case ASN1_PKEY_CTRL_CMS_ENVELOPE: | ||
666 | if (arg1 == 0) | ||
667 | CMS_RecipientInfo_ktri_get0_algs(arg2, NULL, NULL, &alg3); | ||
668 | break; | ||
669 | #endif | ||
670 | case ASN1_PKEY_CTRL_DEFAULT_MD_NID: | 656 | case ASN1_PKEY_CTRL_DEFAULT_MD_NID: |
671 | *(int *)arg2 = GostR3410_get_md_digest(digest); | 657 | *(int *)arg2 = GostR3410_get_md_digest(digest); |
672 | return 2; | 658 | return 2; |