diff options
| author | David Bar <david.bar@gmail.com> | 2015-08-03 12:45:26 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-09-03 14:45:15 -0400 |
| commit | e968561d5e762e6c05e74541137916b4f20a144b (patch) | |
| tree | 5d027d197adcb63ee3457d38534cd4cdb9ea6739 /crypto/ec/ec_ameth.c | |
| parent | 231efb936548320e81c3259b41c26bb71e83720a (diff) | |
RT3674: Make no-cms build work.
Also has changes from from David Woodhouse <David.Woodhouse@intel.com>
and some tweaks from me.
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/ec/ec_ameth.c')
| -rw-r--r-- | crypto/ec/ec_ameth.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c index edb68d119d..e2f32872c6 100644 --- a/crypto/ec/ec_ameth.c +++ b/crypto/ec/ec_ameth.c @@ -67,8 +67,10 @@ #include <openssl/asn1t.h> #include "internal/asn1_int.h" +#ifndef OPENSSL_NO_CMS static int ecdh_cms_decrypt(CMS_RecipientInfo *ri); static int ecdh_cms_encrypt(CMS_RecipientInfo *ri); +#endif static int eckey_param2type(int *pptype, void **ppval, EC_KEY *ec_key) { |