|
 |
b6b438 |
From 85dab1964a66f2c520a88b368cacf655abdb89db Mon Sep 17 00:00:00 2001
|
|
|
b6b438 |
From: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
Date: Wed, 13 Nov 2019 13:59:30 +0100
|
|
|
b6b438 |
Subject: [PATCH 144/187] s4:lib: Remove gnutls_global_(de)init() from libtls
|
|
|
b6b438 |
|
|
|
b6b438 |
This is handled by the gnutls library constructor/destructor.
|
|
|
b6b438 |
|
|
|
b6b438 |
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
(cherry picked from commit 0e159b725ecf2f9a6d026170253e2d1eb73ed0c2)
|
|
|
b6b438 |
---
|
|
|
b6b438 |
source4/lib/tls/tls_tstream.c | 12 ------------
|
|
|
b6b438 |
source4/lib/tls/tlscert.c | 3 ---
|
|
|
b6b438 |
2 files changed, 15 deletions(-)
|
|
|
b6b438 |
|
|
|
b6b438 |
diff --git a/source4/lib/tls/tls_tstream.c b/source4/lib/tls/tls_tstream.c
|
|
|
b6b438 |
index b68996db894..55bca036776 100644
|
|
|
b6b438 |
--- a/source4/lib/tls/tls_tstream.c
|
|
|
b6b438 |
+++ b/source4/lib/tls/tls_tstream.c
|
|
|
b6b438 |
@@ -903,12 +903,6 @@ NTSTATUS tstream_tls_params_client(TALLOC_CTX *mem_ctx,
|
|
|
b6b438 |
struct tstream_tls_params *tlsp;
|
|
|
b6b438 |
int ret;
|
|
|
b6b438 |
|
|
|
b6b438 |
- ret = gnutls_global_init();
|
|
|
b6b438 |
- if (ret != GNUTLS_E_SUCCESS) {
|
|
|
b6b438 |
- DEBUG(0,("TLS %s - %s\n", __location__, gnutls_strerror(ret)));
|
|
|
b6b438 |
- return NT_STATUS_NOT_SUPPORTED;
|
|
|
b6b438 |
- }
|
|
|
b6b438 |
-
|
|
|
b6b438 |
tlsp = talloc_zero(mem_ctx, struct tstream_tls_params);
|
|
|
b6b438 |
NT_STATUS_HAVE_NO_MEMORY(tlsp);
|
|
|
b6b438 |
|
|
|
b6b438 |
@@ -1123,12 +1117,6 @@ NTSTATUS tstream_tls_params_server(TALLOC_CTX *mem_ctx,
|
|
|
b6b438 |
return NT_STATUS_OK;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
|
|
|
b6b438 |
- ret = gnutls_global_init();
|
|
|
b6b438 |
- if (ret != GNUTLS_E_SUCCESS) {
|
|
|
b6b438 |
- DEBUG(0,("TLS %s - %s\n", __location__, gnutls_strerror(ret)));
|
|
|
b6b438 |
- return NT_STATUS_NOT_SUPPORTED;
|
|
|
b6b438 |
- }
|
|
|
b6b438 |
-
|
|
|
b6b438 |
tlsp = talloc_zero(mem_ctx, struct tstream_tls_params);
|
|
|
b6b438 |
NT_STATUS_HAVE_NO_MEMORY(tlsp);
|
|
|
b6b438 |
|
|
|
b6b438 |
diff --git a/source4/lib/tls/tlscert.c b/source4/lib/tls/tlscert.c
|
|
|
b6b438 |
index e02ee13d7e9..f5e9a1f2d39 100644
|
|
|
b6b438 |
--- a/source4/lib/tls/tlscert.c
|
|
|
b6b438 |
+++ b/source4/lib/tls/tlscert.c
|
|
|
b6b438 |
@@ -62,8 +62,6 @@ void tls_cert_generate(TALLOC_CTX *mem_ctx,
|
|
|
b6b438 |
} \
|
|
|
b6b438 |
} while (0)
|
|
|
b6b438 |
|
|
|
b6b438 |
- TLSCHECK(gnutls_global_init());
|
|
|
b6b438 |
-
|
|
|
b6b438 |
DEBUG(0,("Attempting to autogenerate TLS self-signed keys for https for hostname '%s'\n",
|
|
|
b6b438 |
hostname));
|
|
|
b6b438 |
|
|
|
b6b438 |
@@ -150,7 +148,6 @@ void tls_cert_generate(TALLOC_CTX *mem_ctx,
|
|
|
b6b438 |
gnutls_x509_privkey_deinit(cakey);
|
|
|
b6b438 |
gnutls_x509_crt_deinit(cacrt);
|
|
|
b6b438 |
gnutls_x509_crt_deinit(crt);
|
|
|
b6b438 |
- gnutls_global_deinit();
|
|
|
b6b438 |
|
|
|
b6b438 |
DEBUG(0,("TLS self-signed keys generated OK\n"));
|
|
|
b6b438 |
return;
|
|
|
b6b438 |
--
|
|
|
b6b438 |
2.23.0
|
|
|
b6b438 |
|