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 /lib/crypto | |
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 'lib/crypto')
-rw-r--r-- | lib/crypto/gnutls_error.c | 69 | ||||
-rw-r--r-- | lib/crypto/gnutls_helpers.h | 31 | ||||
-rw-r--r-- | lib/crypto/wscript_build | 4 |
3 files changed, 104 insertions, 0 deletions
diff --git a/lib/crypto/gnutls_error.c b/lib/crypto/gnutls_error.c new file mode 100644 index 00000000000..9e124c20c68 --- /dev/null +++ b/lib/crypto/gnutls_error.c @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2019 Andreas Schneider <asn@samba.org> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "includes.h" +#include "gnutls_helpers.h" + +#include <gnutls/gnutls.h> + +NTSTATUS _gnutls_error_to_ntstatus(int gnutls_rc, + NTSTATUS blocked_status, + const char *function, + const char *location) +{ + NTSTATUS status; + + if (gnutls_rc == GNUTLS_E_SUCCESS) { + return NT_STATUS_OK; + } + + switch (gnutls_rc) { + case GNUTLS_E_UNWANTED_ALGORITHM: + status = blocked_status; + break; + case GNUTLS_E_MEMORY_ERROR: + status = NT_STATUS_NO_MEMORY; + break; + case GNUTLS_E_INVALID_REQUEST: + status = NT_STATUS_INVALID_VARIANT; + break; + case GNUTLS_E_DECRYPTION_FAILED: + status = NT_STATUS_DECRYPTION_FAILED; + break; + case GNUTLS_E_ENCRYPTION_FAILED: + status = NT_STATUS_ENCRYPTION_FAILED; + break; + case GNUTLS_E_SHORT_MEMORY_BUFFER: + status = NT_STATUS_INVALID_PARAMETER; + break; + case GNUTLS_E_BASE64_DECODING_ERROR: + case GNUTLS_E_HASH_FAILED: + case GNUTLS_E_LIB_IN_ERROR_STATE: + case GNUTLS_E_INTERNAL_ERROR: + default: + status = NT_STATUS_INTERNAL_ERROR; + break; + } + + D_WARNING("%s: GNUTLS ERROR: %s, NTSTATUS: %s at %s\n", + function, + gnutls_strerror_name(gnutls_rc), + nt_errstr(status), + location); + + return status; +} diff --git a/lib/crypto/gnutls_helpers.h b/lib/crypto/gnutls_helpers.h new file mode 100644 index 00000000000..3e7300ea2c0 --- /dev/null +++ b/lib/crypto/gnutls_helpers.h @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2019 Andreas Schneider <asn@samba.org> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef _GNUTLS_HELPERS_H +#define _GNUTLS_HELPERS_H + +#include "ntstatus.h" + +NTSTATUS _gnutls_error_to_ntstatus(int gnutls_rc, + NTSTATUS blocked_status, + const char *function, + const char *location); +#define gnutls_error_to_ntstatus(gnutls_rc, blocked_status) \ + _gnutls_error_to_ntstatus(gnutls_rc, blocked_status, \ + __FUNCTION__, __location__) + +#endif /* _GNUTLS_HELPERS_H */ diff --git a/lib/crypto/wscript_build b/lib/crypto/wscript_build index 01b70f14f77..e482bbfd487 100644 --- a/lib/crypto/wscript_build +++ b/lib/crypto/wscript_build @@ -5,6 +5,10 @@ extra_deps = '' if bld.CONFIG_SET("HAVE_AESNI_INTEL"): extra_deps += ' aesni-intel' +bld.SAMBA_SUBSYSTEM('GNUTLS_HELPERS', + source='gnutls_error.c', + deps='gnutls samba-errors'); + bld.SAMBA_SUBSYSTEM('LIBCRYPTO', source='''md4.c arcfour.c aes.c rijndael-alg-fst.c aes_cmac_128.c aes_ccm_128.c aes_gcm_128.c |