diff options
| author | dougb <dougb@FreeBSD.org> | 2011-09-03 07:13:45 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2011-09-03 07:13:45 +0000 |
| commit | f18a6196d77d71d90e7f726cfc30101abb2958e1 (patch) | |
| tree | df1f07c78f187c54ea276c24753c42174127668e /contrib/bind9/lib/dns/openssl_link.c | |
| parent | fbc49b949e99a3bf0c24ca3f9e542ae398b89dca (diff) | |
| parent | 9c893fc637e8791d7faedec39c0993533a1fbb6e (diff) | |
| download | FreeBSD-src-f18a6196d77d71d90e7f726cfc30101abb2958e1.zip FreeBSD-src-f18a6196d77d71d90e7f726cfc30101abb2958e1.tar.gz | |
Upgrade to BIND version 9.8.1. Release notes at:
https://deepthought.isc.org/article/AA-00446/81/
or
/usr/src/contrib/bind9/
Approved by: re (kib)
Diffstat (limited to 'contrib/bind9/lib/dns/openssl_link.c')
| -rw-r--r-- | contrib/bind9/lib/dns/openssl_link.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/contrib/bind9/lib/dns/openssl_link.c b/contrib/bind9/lib/dns/openssl_link.c index 8c733f6..49670b1 100644 --- a/contrib/bind9/lib/dns/openssl_link.c +++ b/contrib/bind9/lib/dns/openssl_link.c @@ -1,5 +1,5 @@ /* - * Portions Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") + * Portions Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -31,7 +31,7 @@ /* * Principal Author: Brian Wellington - * $Id: openssl_link.c,v 1.29 2010-09-15 12:38:36 tbox Exp $ + * $Id: openssl_link.c,v 1.29.54.2 2011-03-12 04:59:17 tbox Exp $ */ #ifdef OPENSSL @@ -50,16 +50,6 @@ #include "dst_internal.h" #include "dst_openssl.h" -#include <openssl/err.h> -#include <openssl/rand.h> -#include <openssl/evp.h> -#include <openssl/conf.h> -#include <openssl/crypto.h> - -#if defined(CRYPTO_LOCK_ENGINE) && (OPENSSL_VERSION_NUMBER >= 0x0090707f) -#define USE_ENGINE 1 -#endif - #ifdef USE_ENGINE #include <openssl/engine.h> #endif @@ -308,19 +298,19 @@ dst__openssl_toresult(isc_result_t fallback) { return (result); } +#if defined(USE_ENGINE) ENGINE * dst__openssl_getengine(const char *engine) { if (engine == NULL) return (NULL); -#if defined(USE_ENGINE) if (e == NULL) return (NULL); if (strcmp(engine, ENGINE_get_id(e)) == 0) return (e); -#endif return (NULL); } +#endif #else /* OPENSSL */ |
