43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
|
From 38c91edbe9f634ba4ab90f51b5f2e69742e49f8a Mon Sep 17 00:00:00 2001
|
|||
|
|
From: Andreas Schneider <asn@samba.org>
|
|||
|
|
Date: Mon, 18 Nov 2019 16:33:23 +0100
|
|||
|
|
Subject: [PATCH 160/187] s4:lib:tls: Fix cert and privkey types
|
|||
|
|
MIME-Version: 1.0
|
|||
|
|
Content-Type: text/plain; charset=UTF-8
|
|||
|
|
Content-Transfer-Encoding: 8bit
|
|||
|
|
|
|||
|
|
../../source4/lib/tls/tlscert.c:42:2: warning: ‘gnutls_x509_crt’ is
|
|||
|
|
deprecated [-Wdeprecated-declarations]
|
|||
|
|
42 | gnutls_x509_crt cacrt, crt;
|
|||
|
|
| ^~~~~~~~~~~~~~~
|
|||
|
|
../../source4/lib/tls/tlscert.c:43:2: warning: ‘gnutls_x509_privkey’ is
|
|||
|
|
deprecated [-Wdeprecated-declarations]
|
|||
|
|
43 | gnutls_x509_privkey key, cakey;
|
|||
|
|
| ^~~~~~~~~~~~~~~~~~~
|
|||
|
|
|
|||
|
|
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|||
|
|
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|||
|
|
(cherry picked from commit 71816984c31cd1a392355afdbfdadb0da2d05765)
|
|||
|
|
---
|
|||
|
|
source4/lib/tls/tlscert.c | 4 ++--
|
|||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|||
|
|
|
|||
|
|
diff --git a/source4/lib/tls/tlscert.c b/source4/lib/tls/tlscert.c
|
|||
|
|
index f5e9a1f2d39..9379ab094d1 100644
|
|||
|
|
--- a/source4/lib/tls/tlscert.c
|
|||
|
|
+++ b/source4/lib/tls/tlscert.c
|
|||
|
|
@@ -39,8 +39,8 @@ void tls_cert_generate(TALLOC_CTX *mem_ctx,
|
|||
|
|
const char *keyfile, const char *certfile,
|
|||
|
|
const char *cafile)
|
|||
|
|
{
|
|||
|
|
- gnutls_x509_crt cacrt, crt;
|
|||
|
|
- gnutls_x509_privkey key, cakey;
|
|||
|
|
+ gnutls_x509_crt_t cacrt, crt;
|
|||
|
|
+ gnutls_x509_privkey_t key, cakey;
|
|||
|
|
uint32_t serial = (uint32_t)time(NULL);
|
|||
|
|
unsigned char keyid[100];
|
|||
|
|
char buf[4096];
|
|||
|
|
--
|
|||
|
|
2.23.0
|
|||
|
|
|