summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/err/err_all.c
diff options
context:
space:
mode:
authorbeck <>2015-02-11 03:55:42 +0000
committerbeck <>2015-02-11 03:55:42 +0000
commit4a2309d8058f17b675c178c4996662495981382e (patch)
tree903be911a9730def1b91aa1ccd23138554dc4a4c /src/lib/libcrypto/err/err_all.c
parente1b5dd72bfda4606540ea14d667fab19fb18b964 (diff)
downloadopenbsd-4a2309d8058f17b675c178c4996662495981382e.tar.gz
openbsd-4a2309d8058f17b675c178c4996662495981382e.tar.bz2
openbsd-4a2309d8058f17b675c178c4996662495981382e.zip
get rid of OPENSSL_NO_CMS code we do not use.
ok miod@
Diffstat (limited to 'src/lib/libcrypto/err/err_all.c')
-rw-r--r--src/lib/libcrypto/err/err_all.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/err/err_all.c b/src/lib/libcrypto/err/err_all.c
index e809d79496..296c1a5ba3 100644
--- a/src/lib/libcrypto/err/err_all.c
+++ b/src/lib/libcrypto/err/err_all.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: err_all.c,v 1.20 2015/02/11 03:55:00 beck Exp $ */ 1/* $OpenBSD: err_all.c,v 1.21 2015/02/11 03:55:42 beck Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -115,6 +115,9 @@ ERR_load_crypto_strings(void)
115#ifndef OPENSSL_NO_RSA 115#ifndef OPENSSL_NO_RSA
116 ERR_load_RSA_strings(); 116 ERR_load_RSA_strings();
117#endif 117#endif
118#ifndef OPENSSL_NO_COMP
119#include <openssl/comp.h>
120#endif
118#ifndef OPENSSL_NO_DH 121#ifndef OPENSSL_NO_DH
119 ERR_load_DH_strings(); 122 ERR_load_DH_strings();
120#endif 123#endif
@@ -151,9 +154,6 @@ ERR_load_crypto_strings(void)
151#endif 154#endif
152 ERR_load_OCSP_strings(); 155 ERR_load_OCSP_strings();
153 ERR_load_UI_strings(); 156 ERR_load_UI_strings();
154#ifndef OPENSSL_NO_CMS
155 ERR_load_CMS_strings();
156#endif
157#ifndef OPENSSL_NO_GOST 157#ifndef OPENSSL_NO_GOST
158 ERR_load_GOST_strings(); 158 ERR_load_GOST_strings();
159#endif 159#endif