Commit 89a95f22 authored by Pascal Quantin's avatar Pascal Quantin

Add Kerberos 3.2.2 package for Win64

Change-Id: If02469aa1a01972d2032478dce3bf872802f37cb
Reviewed-on: https://code.wireshark.org/review/4661
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: default avatarPascal Quantin <pascal.quantin@gmail.com>
parent 1f481258
......@@ -511,6 +511,10 @@ guilibsdll = $(guilibsdll)
HHC_LIBS = $(HHC_LIBS)
COMERR_DLL = $(COMERR_DLL)
KRB5_DLL = $(KRB5_DLL)
K5SPRT_DLL = $(K5SPRT_DLL)
SH = $(SH)
PYTHON = $(PYTHON)
......@@ -983,7 +987,11 @@ process_libs:
!IFDEF KFW_DIR
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
. \
!IF "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
kfw-3-2-2-i386-ws-vc6.zip \
!ELSE
kfw-3-2-2-x64-ws.zip \
!ENDIF
"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
# @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
# . \
......@@ -1117,8 +1125,8 @@ clean_setup:
rm -r -f gtk-wimp
rm -r -f kfw-2.5
rm -r -f kfw-3-2-2-final
rm -r -f kfw-3.2.2-ws1
rm -r -f kfw-3-2-2-i386-ws-vc6
rm -r -f kfw-3-2-2-x64-ws
rm -r -f libiconv-1.9.1.bin.woe32
rm -r -f lua5.1
rm -r -f lua5.1.4
......@@ -1381,9 +1389,9 @@ install-all: install-generated-files
xcopy $(ADNS_DLL) $(INSTALL_DIR) /d
!ENDIF
!IFDEF KFW_DIR
xcopy $(KFW_PATH)\comerr32.dll $(INSTALL_DIR) /d
xcopy $(KFW_PATH)\krb5_32.dll $(INSTALL_DIR) /d
xcopy $(KFW_PATH)\k5sprt32.dll $(INSTALL_DIR) /d
xcopy $(KFW_PATH)\$(COMERR_DLL) $(INSTALL_DIR) /d
xcopy $(KFW_PATH)\$(KRB5_DLL) $(INSTALL_DIR) /d
xcopy $(KFW_PATH)\$(K5SPRT_DLL) $(INSTALL_DIR) /d
!ENDIF
!IFDEF GNUTLS_DIR
xcopy $(GNUTLS_DIR)\bin\libffi-6.dll $(INSTALL_DIR) /d
......
......@@ -333,10 +333,10 @@ read_keytab_file(const char *filename)
g_snprintf(pos, KRB_MAX_ORIG_LEN, "keytab principal "));
for(i=0;i<key.principal->length;i++){
pos+=MIN(KRB_MAX_ORIG_LEN-(pos-new_key->key_origin),
g_snprintf(pos, KRB_MAX_ORIG_LEN-(pos-new_key->key_origin), "%s%s",(i?"/":""),(key.principal->data[i]).data));
g_snprintf(pos, (gulong)(KRB_MAX_ORIG_LEN-(pos-new_key->key_origin)), "%s%s",(i?"/":""),(key.principal->data[i]).data));
}
pos+=MIN(KRB_MAX_ORIG_LEN-(pos-new_key->key_origin),
g_snprintf(pos, KRB_MAX_ORIG_LEN-(pos-new_key->key_origin), "@%s",key.principal->realm.data));
g_snprintf(pos, (gulong)(KRB_MAX_ORIG_LEN-(pos-new_key->key_origin)), "@%s",key.principal->realm.data));
*pos=0;
new_key->keytype=key.key.enctype;
new_key->keylength=key.key.length;
......
......@@ -431,6 +431,9 @@ GCC_DLL=libgcc_s_sjlj-1.dll
# isn't defined.
#
KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3-2-2-i386-ws-vc6
COMERR_DLL=comerr32.dll
KRB5_DLL=krb5_32.dll
K5SPRT_DLL=k5sprt32.dll
# Optional: the LUA library enables scripting support.
#
......@@ -679,7 +682,10 @@ GCC_DLL=libgcc_s_seh-1.dll
# If you don't have KFW, comment this line out, so that KFW_DIR
# isn't defined.
#
#KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3.2.2-ws1
KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3-2-2-x64-ws
COMERR_DLL=comerr64.dll
KRB5_DLL=krb5_64.dll
K5SPRT_DLL=k5sprt64.dll
#
# Optional: the LUA library enables scripting support.
......@@ -1434,7 +1440,7 @@ NEED_XML_DLL=USE
# GTK+
## Note: If Wireshark is ever to be built with Gtk >= 3.10
## then -DGTK_DISABLE_DEPRECATED must be removed
## and -DGDK_DISABLE_DEPRECIATION_WARNINGS must
## and -DGDK_DISABLE_DEPRECATION_WARNINGS must
## be added below.
## Wireshark changes to handle Gtk 3.10 deprecated features
## will not be done since Wireshark is moving to Qt.
......@@ -1610,7 +1616,11 @@ ADNS_CONFIG=
!IFDEF KFW_DIR
KFW_PATH=$(KFW_DIR)\bin
KFW_CFLAGS=/I$(KFW_DIR)\include
!IF "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
KFW_LIBS=$(KFW_DIR)\lib\krb5_32.lib
!ELSE
KFW_LIBS=$(KFW_DIR)\lib\krb5_64.lib
!ENDIF
# Nmake uses carets to escape special characters
KFW_CONFIG=^#define HAVE_MIT_KERBEROS 1
!else
......
......@@ -584,10 +584,10 @@ read_keytab_file(const char *filename)
g_snprintf(pos, KRB_MAX_ORIG_LEN, "keytab principal "));
for(i=0;i<key.principal->length;i++){
pos+=MIN(KRB_MAX_ORIG_LEN-(pos-new_key->key_origin),
g_snprintf(pos, KRB_MAX_ORIG_LEN-(pos-new_key->key_origin), "%s%s",(i?"/":""),(key.principal->data[i]).data));
g_snprintf(pos, (gulong)(KRB_MAX_ORIG_LEN-(pos-new_key->key_origin)), "%s%s",(i?"/":""),(key.principal->data[i]).data));
}
pos+=MIN(KRB_MAX_ORIG_LEN-(pos-new_key->key_origin),
g_snprintf(pos, KRB_MAX_ORIG_LEN-(pos-new_key->key_origin), "@%s",key.principal->realm.data));
g_snprintf(pos, (gulong)(KRB_MAX_ORIG_LEN-(pos-new_key->key_origin)), "@%s",key.principal->realm.data));
*pos=0;
new_key->keytype=key.key.enctype;
new_key->keylength=key.key.length;
......
......@@ -202,6 +202,9 @@ NSIS_FLAGS=\
!IF "$(KFW_DIR)" != ""
/DKFW_DIR=$(KFW_DIR) \
/DKFW_PATH=$(KFW_PATH) \
/DCOMERR_DLL=$(COMERR_DLL) \
/DKRB5_DLL=$(KRB5_DLL) \
/DK5SPRT_DLL=$(K5SPRT_DLL) \
!ENDIF
!IF "$(GNUTLS_DIR)" != ""
/DGPGERROR_DLL=$(GPGERROR_DLL) \
......
......@@ -344,9 +344,9 @@ File "${STAGING_DIR}\libcares-2.dll"
File "${STAGING_DIR}\adns_dll.dll"
!endif
!ifdef KFW_DIR
File "${STAGING_DIR}\comerr32.dll"
File "${STAGING_DIR}\krb5_32.dll"
File "${STAGING_DIR}\k5sprt32.dll"
File "${STAGING_DIR}\${COMERR_DLL}"
File "${STAGING_DIR}\${KRB5_DLL}"
File "${STAGING_DIR}\${K5SPRT_DLL}"
!endif
!ifdef GNUTLS_DIR
File "${STAGING_DIR}\libffi-6.dll"
......
......@@ -467,7 +467,7 @@ win32 {
wireshark_use_kfw {
EXTRA_BINFILES += \
$${KFW_DIR}/bin/comerr32.dll $${KFW_DIR}/bin/krb5_32.dll $${KFW_DIR}/bin/k5sprt32.dll
$${KFW_DIR}/bin/$${COMERR_DLL} $${KFW_DIR}/bin/$${KRB5_DLL} $${KFW_DIR}/bin/$${K5SPRT_DLL}
}
EXTRA_BINFILES ~= s,/,\\,g
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment