From 74b6aedb7d6d115e1fa81e96806190a780392341 Mon Sep 17 00:00:00 2001
From: beck <>
Date: Wed, 11 Feb 2015 04:05:14 +0000
Subject: Guenther has plans for OPENSSL_NO_CMS, so revert this for the moment.

---
 src/lib/libcrypto/err/err_all.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/lib/libcrypto/err/err_all.c')

diff --git a/src/lib/libcrypto/err/err_all.c b/src/lib/libcrypto/err/err_all.c
index 296c1a5ba3..58adce64e7 100644
--- a/src/lib/libcrypto/err/err_all.c
+++ b/src/lib/libcrypto/err/err_all.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: err_all.c,v 1.21 2015/02/11 03:55:42 beck Exp $ */
+/* $OpenBSD: err_all.c,v 1.22 2015/02/11 04:05:14 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -115,9 +115,6 @@ ERR_load_crypto_strings(void)
 #ifndef OPENSSL_NO_RSA
 	ERR_load_RSA_strings();
 #endif
-#ifndef OPENSSL_NO_COMP
-#include <openssl/comp.h>
-#endif
 #ifndef OPENSSL_NO_DH
 	ERR_load_DH_strings();
 #endif
@@ -154,6 +151,9 @@ ERR_load_crypto_strings(void)
 #endif
 	ERR_load_OCSP_strings();
 	ERR_load_UI_strings();
+#ifndef OPENSSL_NO_CMS
+	ERR_load_CMS_strings();
+#endif
 #ifndef OPENSSL_NO_GOST
 	ERR_load_GOST_strings();
 #endif
-- 
cgit v1.2.3-55-g6feb