diff options
| author | Günther Deschner <gd@samba.org> | 2011-12-15 17:50:33 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2012-01-10 15:05:37 +0100 |
| commit | 0f7918425a3deb3cbbc91cffcfdbbd00926c3937 (patch) | |
| tree | 3327d2ef8452dae1923ba8f54296049d0ebb5dba | |
| parent | 91ffcdd5a962141f1b780126621ca8b908da8dcf (diff) | |
| download | samba-0f7918425a3deb3cbbc91cffcfdbbd00926c3937.tar.gz samba-0f7918425a3deb3cbbc91cffcfdbbd00926c3937.tar.bz2 samba-0f7918425a3deb3cbbc91cffcfdbbd00926c3937.zip | |
samba: check for AES encryption type defines.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Tue Jan 10 15:05:38 CET 2012 on sn-devel-104
| -rw-r--r-- | source3/configure.in | 21 | ||||
| -rw-r--r-- | source3/wscript | 2 | ||||
| -rw-r--r-- | source4/heimdal_build/wscript_configure | 2 |
3 files changed, 25 insertions, 0 deletions
diff --git a/source3/configure.in b/source3/configure.in index 32561fa72c..c671a42dcb 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -4146,6 +4146,27 @@ if test x"$with_ads_support" != x"no"; then found_arcfour_hmac=yes fi + AC_CACHE_CHECK([for ENCTYPE_AES128_CTS_HMAC_SHA1_96], + samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96,[ + AC_TRY_COMPILE([#include <krb5.h>], + [krb5_enctype enctype; enctype = ENCTYPE_AES128_CTS_HMAC_SHA1_96;], + samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96=yes, + samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96=no)]) + if test x"$samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96" = x"yes"; then + AC_DEFINE(HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96,1, + [Whether the ENCTYPE_AES128_CTS_HMAC_SHA1_96 key type definition is available]) + fi + AC_CACHE_CHECK([for ENCTYPE_AES256_CTS_HMAC_SHA1_96], + samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96,[ + AC_TRY_COMPILE([#include <krb5.h>], + [krb5_enctype enctype; enctype = ENCTYPE_AES256_CTS_HMAC_SHA1_96;], + samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96=yes, + samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96=no)]) + if test x"$samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96" = x"yes"; then + AC_DEFINE(HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96,1, + [Whether the ENCTYPE_AES256_CTS_HMAC_SHA1_96 key type definition is available]) + fi + AC_CACHE_CHECK([for AP_OPTS_USE_SUBKEY], samba_cv_HAVE_AP_OPTS_USE_SUBKEY,[ AC_TRY_COMPILE([#include <krb5.h>], diff --git a/source3/wscript b/source3/wscript index 9a32ab7e75..1592ccbdca 100644 --- a/source3/wscript +++ b/source3/wscript @@ -598,6 +598,8 @@ krb5_get_credentials_for_user krb5_get_host_realm krb5_free_host_realm''', conf.CHECK_VARIABLE('KV5M_KEYTAB', headers='krb5.h') conf.CHECK_VARIABLE('KRB5_KU_OTHER_CKSUM', headers='krb5.h') conf.CHECK_VARIABLE('KRB5_KEYUSAGE_APP_DATA_CKSUM', headers='krb5.h') + conf.CHECK_VARIABLE('ENCTYPE_AES128_CTS_HMAC_SHA1_96', headers='krb5.h') + conf.CHECK_VARIABLE('ENCTYPE_AES256_CTS_HMAC_SHA1_96', headers='krb5.h') conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'key', headers='krb5.h', define='HAVE_KRB5_KEYTAB_ENTRY_KEY') conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'keyblock', headers='krb5.h', diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure index 5dc4aa14e1..2c111b99e8 100644 --- a/source4/heimdal_build/wscript_configure +++ b/source4/heimdal_build/wscript_configure @@ -152,6 +152,8 @@ conf.define('HAVE_AP_OPTS_USE_SUBKEY', 1) conf.define('HAVE_ENCTYPE_ARCFOUR_HMAC_MD5', 1) conf.define('HAVE_ENCTYPE_ARCFOUR_HMAC', 1) conf.define('HAVE_KRB5_PDU_NONE_DECL', 1) +conf.define('HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96', 1) +conf.define('HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96', 1) heimdal_includedirs = [] heimdal_libdirs = [] |