summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2019-09-09 17:56:00 +0000
committerjsing <>2019-09-09 17:56:00 +0000
commit0f582df15e8337f01b1f747d7a848d1be6c7b25d (patch)
tree74943166269801e0f43a4ac63c9e4a8c4f0c8cb4
parent0e79c6924e00e48c99118d09ca930eca7cadb690 (diff)
downloadopenbsd-0f582df15e8337f01b1f747d7a848d1be6c7b25d.tar.gz
openbsd-0f582df15e8337f01b1f747d7a848d1be6c7b25d.tar.bz2
openbsd-0f582df15e8337f01b1f747d7a848d1be6c7b25d.zip
Move #include <openssl/cms.h> to more appropriate location (since it is
now being installed).
-rw-r--r--src/lib/libcrypto/ec/ec_ameth.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libcrypto/ec/ec_ameth.c b/src/lib/libcrypto/ec/ec_ameth.c
index a7e80c73d7..ad7b03f739 100644
--- a/src/lib/libcrypto/ec/ec_ameth.c
+++ b/src/lib/libcrypto/ec/ec_ameth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_ameth.c,v 1.26 2019/09/08 17:00:05 jsing Exp $ */ 1/* $OpenBSD: ec_ameth.c,v 1.27 2019/09/09 17:56:00 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006. 3 * project 2006.
4 */ 4 */
@@ -61,6 +61,7 @@
61#include <openssl/opensslconf.h> 61#include <openssl/opensslconf.h>
62 62
63#include <openssl/bn.h> 63#include <openssl/bn.h>
64#include <openssl/cms.h>
64#include <openssl/ec.h> 65#include <openssl/ec.h>
65#include <openssl/err.h> 66#include <openssl/err.h>
66#include <openssl/x509.h> 67#include <openssl/x509.h>
@@ -68,8 +69,6 @@
68#include "asn1_locl.h" 69#include "asn1_locl.h"
69 70
70#ifndef OPENSSL_NO_CMS 71#ifndef OPENSSL_NO_CMS
71#include <openssl/cms.h>
72
73static int ecdh_cms_decrypt(CMS_RecipientInfo *ri); 72static int ecdh_cms_decrypt(CMS_RecipientInfo *ri);
74static int ecdh_cms_encrypt(CMS_RecipientInfo *ri); 73static int ecdh_cms_encrypt(CMS_RecipientInfo *ri);
75#endif 74#endif