diff options
| author | Matt Caswell <matt@openssl.org> | 2020-10-07 16:59:28 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-15 11:00:28 +0200 |
| commit | 7022d9b9032794330cd2d753f077670db95d33d4 (patch) | |
| tree | d582bbfaf07740c420a4115794fd1210076437b2 /crypto/dh | |
| parent | Move CMS signing code out of the algorithms and into CMS (diff) | |
| download | openssl-7022d9b9032794330cd2d753f077670db95d33d4.tar.xz openssl-7022d9b9032794330cd2d753f077670db95d33d4.zip | |
Remove CMS recipient info information out of the algorithm implementations
Low level algorithm implementations have no business knowing about details
of the higher level CMS concept. This knowledge is therefore moved into the
CMS layer.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13088)
Diffstat (limited to 'crypto/dh')
| -rw-r--r-- | crypto/dh/dh_ameth.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c index 46a2fdd881..9ad75d2092 100644 --- a/crypto/dh/dh_ameth.c +++ b/crypto/dh/dh_ameth.c @@ -19,7 +19,6 @@ #include <openssl/bn.h> #include <openssl/core_names.h> #include <openssl/param_build.h> -#include <openssl/cms.h> #include "internal/ffc.h" #include "internal/cryptlib.h" #include "crypto/asn1.h" @@ -449,11 +448,6 @@ static int dh_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2) static int dhx_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2) { switch (op) { -#ifndef OPENSSL_NO_CMS - case ASN1_PKEY_CTRL_CMS_RI_TYPE: - *(int *)arg2 = CMS_RECIPINFO_AGREE; - return 1; -#endif default: return -2; } |