diff options
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/crypto/cms/cms_cd.c | 5 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/err/err_all.c | 8 |
2 files changed, 2 insertions, 11 deletions
diff --git a/lib/libssl/src/crypto/cms/cms_cd.c b/lib/libssl/src/crypto/cms/cms_cd.c index bcf1506916e..0489a3d8a3d 100644 --- a/lib/libssl/src/crypto/cms/cms_cd.c +++ b/lib/libssl/src/crypto/cms/cms_cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_cd.c,v 1.5 2014/07/11 08:44:48 jsing Exp $ */ +/* $OpenBSD: cms_cd.c,v 1.6 2015/02/11 03:55:00 beck Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -60,9 +60,6 @@ #include <openssl/pem.h> #include <openssl/x509v3.h> -#ifndef OPENSSL_NO_COMP -#include <openssl/comp.h> -#endif #include "cms_lcl.h" diff --git a/lib/libssl/src/crypto/err/err_all.c b/lib/libssl/src/crypto/err/err_all.c index c880f1fbf36..e809d79496e 100644 --- a/lib/libssl/src/crypto/err/err_all.c +++ b/lib/libssl/src/crypto/err/err_all.c @@ -1,4 +1,4 @@ -/* $OpenBSD: err_all.c,v 1.19 2014/11/09 19:17:13 miod Exp $ */ +/* $OpenBSD: err_all.c,v 1.20 2015/02/11 03:55:00 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -81,9 +81,6 @@ #ifndef OPENSSL_NO_CMS #include <openssl/cms.h> #endif -#ifndef OPENSSL_NO_COMP -#include <openssl/comp.h> -#endif #ifndef OPENSSL_NO_DH #include <openssl/dh.h> #endif @@ -132,9 +129,6 @@ ERR_load_crypto_strings(void) ERR_load_ASN1_strings(); ERR_load_CONF_strings(); ERR_load_CRYPTO_strings(); -#ifndef OPENSSL_NO_COMP - ERR_load_COMP_strings(); -#endif #ifndef OPENSSL_NO_EC ERR_load_EC_strings(); #endif |