summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/cms
diff options
context:
space:
mode:
authorbeck <>2015-02-11 04:05:14 +0000
committerbeck <>2015-02-11 04:05:14 +0000
commit74b6aedb7d6d115e1fa81e96806190a780392341 (patch)
treeaa9f1278214f1d7d996d30cf1959f3878cb48be1 /src/lib/libcrypto/cms
parent16aad183ce9bacab429bd62937373a0da02849ec (diff)
downloadopenbsd-74b6aedb7d6d115e1fa81e96806190a780392341.tar.gz
openbsd-74b6aedb7d6d115e1fa81e96806190a780392341.tar.bz2
openbsd-74b6aedb7d6d115e1fa81e96806190a780392341.zip
Guenther has plans for OPENSSL_NO_CMS, so revert this for the moment.
Diffstat (limited to 'src/lib/libcrypto/cms')
-rw-r--r--src/lib/libcrypto/cms/cms.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libcrypto/cms/cms.h b/src/lib/libcrypto/cms/cms.h
index f08e2f8457..9a5aae5299 100644
--- a/src/lib/libcrypto/cms/cms.h
+++ b/src/lib/libcrypto/cms/cms.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: cms.h,v 1.6 2015/02/11 03:55:42 beck Exp $ */ 1/* $OpenBSD: cms.h,v 1.7 2015/02/11 04:05:14 beck 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. 3 * project.
4 */ 4 */
@@ -58,7 +58,9 @@
58 58
59#include <openssl/x509.h> 59#include <openssl/x509.h>
60 60
61#ifdef OPENSSL_NO_CMS
61#error CMS is disabled. 62#error CMS is disabled.
63#endif
62 64
63#ifdef __cplusplus 65#ifdef __cplusplus
64extern "C" { 66extern "C" {