infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-10 06:59:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

8010192: Enable native JGSS provider on Mac

Browse Source 
Reviewed-by: valeriep
This commit is contained in:
Weijun Wang 2013-05-07 12:30:36 +08:00
parent 722199f9b2
commit 5ec35be1d2
6 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/make/sun/security/Makefile
View File

@ -38,12 +38,10 @@ SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true
SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
include $(BUILDDIR)/common/Defs.gmk
# build sun/security/jgss/wrapper on non-windows non-macosx platforms
# build sun/security/jgss/wrapper on non-windows platforms
JGSS_WRAPPER =
ifneq ($(PLATFORM), windows)
ifneq ($(PLATFORM), macosx)
JGSS_WRAPPER = jgss/wrapper
endif
JGSS_WRAPPER = jgss/wrapper
endif
# Build PKCS#11 on all platforms

2
jdk/makefiles/CompileNativeLibraries.gmk
View File

@ -2545,7 +2545,6 @@ BUILD_LIBRARIES += $(BUILD_LIBJ2PCSC)
##########################################################################################
ifneq ($(OPENJDK_TARGET_OS), windows)
ifneq ($(OPENJDK_TARGET_OS), macosx)
$(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS,\
LIBRARY:=j2gss,\
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
@ -2565,7 +2564,6 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS,\
BUILD_LIBRARIES += $(BUILD_LIBJ2GSS)
endif
endif
##########################################################################################

1
jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java
View File

@ -48,6 +48,7 @@ public class GSSManagerImpl extends GSSManager {
public Boolean run() {
String osname = System.getProperty("os.name");
if (osname.startsWith("SunOS") ||
osname.contains("OS X") ||
osname.startsWith("Linux")) {
return new Boolean(System.getProperty
(USE_NATIVE_PROP));

5
jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
View File

@ -90,6 +90,11 @@ public final class SunNativeProvider extends Provider {
"libgssapi_krb5.so",
"libgssapi_krb5.so.2",
};
} else if (osname.contains("OS X")) {
gssLibs = new String[]{
"libgssapi_krb5.dylib",
"/usr/lib/sasl2/libgssapiv2.2.so",
};
}
} else {
gssLibs = new String[]{ defaultLib };

15
jdk/src/share/native/sun/security/jgss/wrapper/gssapi.h
View File

@ -32,10 +32,21 @@
#ifndef _GSSAPI_H_
#define _GSSAPI_H_
#if defined(__MACH__) && defined(__APPLE__)
# include <TargetConditionals.h>
# if TARGET_RT_MAC_CFM
# error "Use KfM 4.0 SDK headers for CFM compilation."
# endif
#endif
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#if TARGET_OS_MAC
# pragma pack(push,2)
#endif
/*
* First, include stddef.h to get size_t defined.
*/
@ -671,6 +682,10 @@ OM_uint32 gss_canonicalize_name(
gss_name_t * /* output_name */
);
#if TARGET_OS_MAC
# pragma pack(pop)
#endif
#ifdef __cplusplus
}
#endif

6
jdk/test/sun/security/krb5/runNameEquals.sh
View File

@ -52,15 +52,11 @@ NATIVE=false
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux )
SunOS | Linux | Darwin )
PATHSEP=":"
FILESEP="/"
NATIVE=true
;;
Darwin )
PATHSEP=":"
FILESEP="/"
;;
CYGWIN* )
PATHSEP=";"
FILESEP="/"