s4:rpc_server: Remove obsolete gcrypt init

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c b/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c
index 60d082378d75af5cd1b4bded51070a792a613250..806f144a24bdac6be4f513c14f2072c11e59552e 100644 (file)
--- 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 <gnutls/gnutls.h>
 #include <gnutls/x509.h>
-#if defined(HAVE_GCRYPT_H) && !defined(HAVE_GNUTLS3)
-#include <gcrypt.h>
-#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(&gtls_key);
        if (ret != 0) {
                gnutls_global_deinit();

diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index 510335a6498dc8b3e662dbf649eea22af354239d..ece71b6adae0969b57702daf49c709c473c02803 100644 (file)
--- 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',
                )