diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2019-06-26 16:41:05 +1200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2019-06-27 12:54:22 +0000 |
| commit | 8f4c30f785cd012597883016e35f794e9a800404 (patch) | |
| tree | a424c283503356f74130a3c4499cfdb19caa4ca4 /auth | |
| parent | 29ee235caee7e703ee9ebee342c8decb017fd099 (diff) | |
| download | samba-8f4c30f785cd012597883016e35f794e9a800404.tar.gz | |
lib/crypto: move gnutls error wrapper to own subsystem
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'auth')
| -rw-r--r-- | auth/credentials/credentials_ntlm.c | 2 | ||||
| -rw-r--r-- | auth/credentials/wscript_build | 2 | ||||
| -rw-r--r-- | auth/gensec/schannel.c | 2 | ||||
| -rw-r--r-- | auth/gensec/wscript_build | 2 | ||||
| -rw-r--r-- | auth/ntlmssp/ntlmssp_client.c | 2 | ||||
| -rw-r--r-- | auth/ntlmssp/ntlmssp_server.c | 2 | ||||
| -rw-r--r-- | auth/ntlmssp/ntlmssp_sign.c | 2 | ||||
| -rw-r--r-- | auth/ntlmssp/wscript_build | 1 |
8 files changed, 8 insertions, 7 deletions
diff --git a/auth/credentials/credentials_ntlm.c b/auth/credentials/credentials_ntlm.c index f437ee50879..bf55ab97b04 100644 --- a/auth/credentials/credentials_ntlm.c +++ b/auth/credentials/credentials_ntlm.c @@ -28,7 +28,7 @@ #include "auth/credentials/credentials.h" #include "auth/credentials/credentials_internal.h" -#include "libcli/util/gnutls_error.h" +#include "lib/crypto/gnutls_helpers.h" #include <gnutls/gnutls.h> #include <gnutls/crypto.h> diff --git a/auth/credentials/wscript_build b/auth/credentials/wscript_build index 637b6ccf268..f5aba1de248 100644 --- a/auth/credentials/wscript_build +++ b/auth/credentials/wscript_build @@ -22,7 +22,7 @@ bld.SAMBA_SUBSYSTEM('CREDENTIALS_SECRETS', bld.SAMBA_SUBSYSTEM('CREDENTIALS_NTLM', source='credentials_ntlm.c', - deps='samba-credentials') + deps='samba-credentials GNUTLS_HELPERS') pytalloc_util = bld.pyembed_libname('pytalloc-util') pyparam_util = bld.pyembed_libname('pyparam_util') diff --git a/auth/gensec/schannel.c b/auth/gensec/schannel.c index d0febc7dc9c..ef62d978122 100644 --- a/auth/gensec/schannel.c +++ b/auth/gensec/schannel.c @@ -36,7 +36,7 @@ #include "lib/crypto/crypto.h" #include "libds/common/roles.h" -#include "libcli/util/gnutls_error.h" +#include "lib/crypto/gnutls_helpers.h" #include <gnutls/gnutls.h> #include <gnutls/crypto.h> diff --git a/auth/gensec/wscript_build b/auth/gensec/wscript_build index 8f6dedc1909..1d8071d7c0f 100644 --- a/auth/gensec/wscript_build +++ b/auth/gensec/wscript_build @@ -19,7 +19,7 @@ bld.SAMBA_MODULE('gensec_schannel', source='schannel.c', subsystem='gensec', init_function='gensec_schannel_init', - deps='COMMON_SCHANNEL NDR_SCHANNEL samba-credentials auth_session' + deps='COMMON_SCHANNEL NDR_SCHANNEL samba-credentials auth_session GNUTLS_HELPERS' ) bld.SAMBA_MODULE('gensec_ncalrpc', diff --git a/auth/ntlmssp/ntlmssp_client.c b/auth/ntlmssp/ntlmssp_client.c index 8940522d39c..df891f8d933 100644 --- a/auth/ntlmssp/ntlmssp_client.c +++ b/auth/ntlmssp/ntlmssp_client.c @@ -35,7 +35,7 @@ struct auth_session_info; #include "../auth/ntlmssp/ntlmssp_ndr.h" #include "../nsswitch/libwbclient/wbclient.h" -#include "libcli/util/gnutls_error.h" +#include "lib/crypto/gnutls_helpers.h" #include <gnutls/gnutls.h> #include <gnutls/crypto.h> diff --git a/auth/ntlmssp/ntlmssp_server.c b/auth/ntlmssp/ntlmssp_server.c index 6d090b023f8..8fa7baa04d7 100644 --- a/auth/ntlmssp/ntlmssp_server.c +++ b/auth/ntlmssp/ntlmssp_server.c @@ -36,7 +36,7 @@ #include "param/loadparm.h" #include "libcli/security/session.h" -#include "libcli/util/gnutls_error.h" +#include "lib/crypto/gnutls_helpers.h" #include <gnutls/gnutls.h> #include <gnutls/crypto.h> diff --git a/auth/ntlmssp/ntlmssp_sign.c b/auth/ntlmssp/ntlmssp_sign.c index 1c4b11174cb..8ba2e246b34 100644 --- a/auth/ntlmssp/ntlmssp_sign.c +++ b/auth/ntlmssp/ntlmssp_sign.c @@ -24,7 +24,7 @@ #include "zlib.h" #include "../auth/ntlmssp/ntlmssp_private.h" -#include "libcli/util/gnutls_error.h" +#include "lib/crypto/gnutls_helpers.h" #include <gnutls/gnutls.h> #include <gnutls/crypto.h> diff --git a/auth/ntlmssp/wscript_build b/auth/ntlmssp/wscript_build index 0802330ec6a..20836efad0a 100644 --- a/auth/ntlmssp/wscript_build +++ b/auth/ntlmssp/wscript_build @@ -15,6 +15,7 @@ bld.SAMBA_SUBSYSTEM('NTLMSSP_COMMON', samba-credentials wbclient z + GNUTLS_HELPERS ''') bld.SAMBA_MODULE('gensec_ntlmssp', |