diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-06-25 11:11:47 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-06-25 11:11:47 +0000 |
| commit | ce7b55c99a83499aa24478410ef53728583326de (patch) | |
| tree | a6def783a73f65536613611ba41e907744008df1 /usr/src/cmd | |
| parent | acbebb967fadb0cc8c4d4a56e8751cd60c9fb1b5 (diff) | |
| parent | 88e55da9244bc48e3b3ad957a29e4be71309adcd (diff) | |
| download | illumos-joyent-ce7b55c99a83499aa24478410ef53728583326de.tar.gz | |
[illumos-gate merge]
commit 88e55da9244bc48e3b3ad957a29e4be71309adcd
9319 Duplicate include in usr/src/tools/elfextract/Makefile
commit 553e44ce7e541a9e1404b1ead92be0753668710a
6429 SMB domain join doesn't work with libreSSL
9546 Restore support for building against LibreSSL
9547 Remove KMF dependency on insecure encryption types
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/sendmail/src/tls.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/cmd/sendmail/src/tls.c b/usr/src/cmd/sendmail/src/tls.c index 605d91635a..ab17456d78 100644 --- a/usr/src/cmd/sendmail/src/tls.c +++ b/usr/src/cmd/sendmail/src/tls.c @@ -3,6 +3,7 @@ * All rights reserved. * Copyright (c) 2012, OmniTI Computer Consulting, Inc. All rights reserved. * Copyright 2018 OmniOS Community Edition (OmniOSce) Association. + * Copyright 2018 RackTop Systems. * * By using this file, you agree to the terms and conditions set * forth in the LICENSE file which can be found at the top level of @@ -39,7 +40,7 @@ static int tls_verify_log __P((int, X509_STORE_CTX *, char *)); # include <openssl/dh.h> # include <openssl/dsa.h> -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) /* * This compatibility function is taken from @@ -319,7 +320,7 @@ bool init_tls_library() { /* basic TLS initialization, ignore result for now */ -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) /* No longer available (nor necessary) in OpenSSL 1.1 */ SSL_library_init(); SSL_load_error_strings(); |