From b63bf2956e244c8a1ab38e99beddebbeae44c186 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 10 Oct 2018 14:49:47 +0200 Subject: [PATCH] s4:rpc_server: Remove obsolete gcrypt init Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett --- source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c | 8 +------- source4/rpc_server/wscript_build | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c b/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c index 60d082378d7..806f144a24b 100644 --- a/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c +++ b/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c @@ -45,9 +45,6 @@ #include "libds/common/roles.h" #include #include -#if defined(HAVE_GCRYPT_H) && !defined(HAVE_GNUTLS3) -#include -#endif #define DCESRV_INTERFACE_BACKUPKEY_BIND(context, iface) \ dcesrv_interface_backupkey_bind(context, iface) @@ -837,10 +834,7 @@ static WERROR create_heimdal_rsa_key(TALLOC_CTX *ctx, hx509_context *hctx, DBG_ERR("TLS error: %s\n", gnutls_strerror(ret)); return WERR_INTERNAL_ERROR; } -#if defined(HAVE_GCRYPT_H) && !defined(HAVE_GNUTLS3) - DEBUG(3,("Enabling QUICK mode in gcrypt\n")); - gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0); -#endif + ret = gnutls_x509_privkey_init(>ls_key); if (ret != 0) { gnutls_global_deinit(); diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build index 510335a6498..ece71b6adae 100644 --- a/source4/rpc_server/wscript_build +++ b/source4/rpc_server/wscript_build @@ -133,7 +133,7 @@ else: autoproto='backupkey/proto.h', subsystem='dcerpc_server', init_function='dcerpc_server_backupkey_init', - deps='samdb DCERPC_COMMON NDR_BACKUPKEY RPC_NDR_BACKUPKEY krb5 hx509 hcrypto gnutls gcrypt DCERPC_COMMON', + deps='samdb DCERPC_COMMON NDR_BACKUPKEY RPC_NDR_BACKUPKEY krb5 hx509 hcrypto gnutls DCERPC_COMMON', ) -- 2.47.3