Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
c6552bbb
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c6552bbb
编写于
9月 14, 2012
作者:
L
lana
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
2cc1c0a1
b2fbacae
变更
88
展开全部
隐藏空白更改
内联
并排
Showing
88 changed file
with
2787 addition
and
1019 deletion
+2787
-1019
.hgtags
.hgtags
+2
-0
make/common/Defs.gmk
make/common/Defs.gmk
+16
-1
make/common/Demo.gmk
make/common/Demo.gmk
+2
-2
make/common/Library.gmk
make/common/Library.gmk
+3
-3
make/common/Program.gmk
make/common/Program.gmk
+1
-3
make/docs/Makefile
make/docs/Makefile
+1
-1
make/sun/security/ec/Makefile
make/sun/security/ec/Makefile
+0
-1
make/sun/security/other/Makefile
make/sun/security/other/Makefile
+0
-1
src/macosx/native/com/apple/laf/ScreenMenu.m
src/macosx/native/com/apple/laf/ScreenMenu.m
+8
-4
src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiOut.c
.../native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiOut.c
+8
-3
src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiUtils.c
...ative/com/sun/media/sound/PLATFORM_API_MacOSX_MidiUtils.c
+6
-1
src/macosx/native/sun/awt/CSystemColors.m
src/macosx/native/sun/awt/CSystemColors.m
+6
-1
src/macosx/native/sun/awt/CTextPipe.m
src/macosx/native/sun/awt/CTextPipe.m
+5
-1
src/macosx/native/sun/awt/ImageSurfaceData.h
src/macosx/native/sun/awt/ImageSurfaceData.h
+4
-6
src/macosx/native/sun/awt/ImageSurfaceData.m
src/macosx/native/sun/awt/ImageSurfaceData.m
+4
-6
src/macosx/native/sun/awt/QuartzRenderer.m
src/macosx/native/sun/awt/QuartzRenderer.m
+2
-5
src/macosx/native/sun/awt/QuartzSurfaceData.m
src/macosx/native/sun/awt/QuartzSurfaceData.m
+2
-7
src/macosx/native/sun/font/AWTStrike.m
src/macosx/native/sun/font/AWTStrike.m
+6
-1
src/share/back/error_messages.h
src/share/back/error_messages.h
+9
-4
src/share/back/log_messages.h
src/share/back/log_messages.h
+6
-2
src/share/bin/jli_util.h
src/share/bin/jli_util.h
+12
-1
src/share/bin/manifest_info.h
src/share/bin/manifest_info.h
+34
-3
src/share/bin/parse_manifest.c
src/share/bin/parse_manifest.c
+136
-58
src/share/classes/com/sun/crypto/provider/AESCipher.java
src/share/classes/com/sun/crypto/provider/AESCipher.java
+110
-3
src/share/classes/com/sun/crypto/provider/AESWrapCipher.java
src/share/classes/com/sun/crypto/provider/AESWrapCipher.java
+32
-4
src/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java
...e/classes/com/sun/crypto/provider/DHKeyPairGenerator.java
+9
-8
src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
...classes/com/sun/crypto/provider/DHParameterGenerator.java
+5
-5
src/share/classes/com/sun/crypto/provider/SunJCE.java
src/share/classes/com/sun/crypto/provider/SunJCE.java
+57
-5
src/share/classes/java/io/ByteArrayOutputStream.java
src/share/classes/java/io/ByteArrayOutputStream.java
+8
-8
src/share/classes/java/io/InputStreamReader.java
src/share/classes/java/io/InputStreamReader.java
+2
-2
src/share/classes/java/lang/annotation/ContainerFor.java
src/share/classes/java/lang/annotation/ContainerFor.java
+46
-0
src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java
...classes/java/security/interfaces/DSAKeyPairGenerator.java
+9
-7
src/share/classes/java/security/spec/DSAGenParameterSpec.java
...share/classes/java/security/spec/DSAGenParameterSpec.java
+127
-0
src/share/classes/java/sql/DriverManager.java
src/share/classes/java/sql/DriverManager.java
+1
-1
src/share/classes/sun/security/ec/ECKeyFactory.java
src/share/classes/sun/security/ec/ECKeyFactory.java
+19
-26
src/share/classes/sun/security/ec/ECParameters.java
src/share/classes/sun/security/ec/ECParameters.java
+3
-3
src/share/classes/sun/security/ec/ECPublicKeyImpl.java
src/share/classes/sun/security/ec/ECPublicKeyImpl.java
+6
-1
src/share/classes/sun/security/ec/SunECEntries.java
src/share/classes/sun/security/ec/SunECEntries.java
+4
-0
src/share/classes/sun/security/krb5/Config.java
src/share/classes/sun/security/krb5/Config.java
+146
-96
src/share/classes/sun/security/pkcs11/P11Cipher.java
src/share/classes/sun/security/pkcs11/P11Cipher.java
+24
-10
src/share/classes/sun/security/pkcs11/P11ECKeyFactory.java
src/share/classes/sun/security/pkcs11/P11ECKeyFactory.java
+2
-2
src/share/classes/sun/security/pkcs11/SunPKCS11.java
src/share/classes/sun/security/pkcs11/SunPKCS11.java
+36
-10
src/share/classes/sun/security/provider/DSA.java
src/share/classes/sun/security/provider/DSA.java
+433
-365
src/share/classes/sun/security/provider/DSAKeyPairGenerator.java
...re/classes/sun/security/provider/DSAKeyPairGenerator.java
+39
-53
src/share/classes/sun/security/provider/DSAParameterGenerator.java
.../classes/sun/security/provider/DSAParameterGenerator.java
+138
-137
src/share/classes/sun/security/provider/ParameterCache.java
src/share/classes/sun/security/provider/ParameterCache.java
+137
-27
src/share/classes/sun/security/provider/SunEntries.java
src/share/classes/sun/security/provider/SunEntries.java
+24
-4
src/share/classes/sun/security/x509/AlgorithmId.java
src/share/classes/sun/security/x509/AlgorithmId.java
+25
-15
src/share/demo/jvmti/hprof/debug_malloc.h
src/share/demo/jvmti/hprof/debug_malloc.h
+7
-2
src/share/demo/jvmti/hprof/hprof_error.h
src/share/demo/jvmti/hprof/hprof_error.h
+11
-6
src/share/demo/jvmti/hprof/hprof_util.h
src/share/demo/jvmti/hprof/hprof_util.h
+7
-2
src/share/demo/jvmti/java_crw_demo/java_crw_demo.c
src/share/demo/jvmti/java_crw_demo/java_crw_demo.c
+10
-2
src/share/instrument/JPLISAssert.h
src/share/instrument/JPLISAssert.h
+6
-2
src/share/native/sun/awt/debug/debug_assert.h
src/share/native/sun/awt/debug/debug_assert.h
+7
-2
src/share/native/sun/awt/debug/debug_mem.c
src/share/native/sun/awt/debug/debug_mem.c
+6
-1
src/share/native/sun/awt/debug/debug_trace.h
src/share/native/sun/awt/debug/debug_trace.h
+6
-1
src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
+7
-2
src/share/npt/utf.h
src/share/npt/utf.h
+6
-1
src/share/transport/shmem/shmemBase.h
src/share/transport/shmem/shmemBase.h
+7
-2
src/solaris/bin/jexec.c
src/solaris/bin/jexec.c
+2
-1
src/solaris/instrument/EncodingSupport_md.c
src/solaris/instrument/EncodingSupport_md.c
+6
-1
src/windows/native/com/sun/management/OperatingSystem_md.c
src/windows/native/com/sun/management/OperatingSystem_md.c
+16
-15
src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiIn.cpp
.../native/com/sun/media/sound/PLATFORM_API_WinOS_MidiIn.cpp
+7
-1
src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiOut.c
...s/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiOut.c
+7
-1
src/windows/native/sun/java2d/d3d/D3DPipeline.h
src/windows/native/sun/java2d/d3d/D3DPipeline.h
+8
-3
src/windows/native/sun/windows/alloc.h
src/windows/native/sun/windows/alloc.h
+9
-4
src/windows/native/sun/windows/awt_Debug.h
src/windows/native/sun/windows/awt_Debug.h
+6
-1
src/windows/native/sun/windows/awt_Toolkit.h
src/windows/native/sun/windows/awt_Toolkit.h
+10
-4
src/windows/transport/shmem/shmem_md.c
src/windows/transport/shmem/shmem_md.c
+6
-1
test/ProblemList.txt
test/ProblemList.txt
+12
-0
test/com/sun/corba/cachedSocket/7056731.sh
test/com/sun/corba/cachedSocket/7056731.sh
+3
-0
test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
...om/sun/crypto/provider/KeyAgreement/TestExponentSize.java
+20
-4
test/com/sun/management/OperatingSystemMXBean/MemoryStatusOverflow.java
...anagement/OperatingSystemMXBean/MemoryStatusOverflow.java
+64
-0
test/java/nio/file/Files/CopyAndMove.java
test/java/nio/file/Files/CopyAndMove.java
+6
-4
test/sun/security/ec/TestEC.java
test/sun/security/ec/TestEC.java
+8
-2
test/sun/security/pkcs11/ec/ReadCertificates.java
test/sun/security/pkcs11/ec/ReadCertificates.java
+4
-1
test/sun/security/pkcs11/ec/ReadPKCS12.java
test/sun/security/pkcs11/ec/ReadPKCS12.java
+4
-1
test/sun/security/pkcs11/ec/TestECDH.java
test/sun/security/pkcs11/ec/TestECDH.java
+4
-1
test/sun/security/pkcs11/ec/TestECDH2.java
test/sun/security/pkcs11/ec/TestECDH2.java
+127
-0
test/sun/security/pkcs11/ec/TestECDSA.java
test/sun/security/pkcs11/ec/TestECDSA.java
+4
-1
test/sun/security/pkcs11/ec/TestECDSA2.java
test/sun/security/pkcs11/ec/TestECDSA2.java
+122
-0
test/sun/security/provider/DSA/TestAlgParameterGenerator.java
.../sun/security/provider/DSA/TestAlgParameterGenerator.java
+117
-0
test/sun/security/provider/DSA/TestDSA2.java
test/sun/security/provider/DSA/TestDSA2.java
+96
-0
test/sun/security/provider/DSA/TestKeyPairGenerator.java
test/sun/security/provider/DSA/TestKeyPairGenerator.java
+5
-1
test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java
...n/net/www/protocol/https/HttpsURLConnection/B6216082.java
+33
-41
test/sun/tools/jstatd/jpsOutput1.awk
test/sun/tools/jstatd/jpsOutput1.awk
+1
-1
test/tools/launcher/BigJar.java
test/tools/launcher/BigJar.java
+259
-0
test/tools/launcher/TestHelper.java
test/tools/launcher/TestHelper.java
+26
-0
未找到文件。
.hgtags
浏览文件 @
c6552bbb
...
...
@@ -176,3 +176,5 @@ e865efbc71059a414b3b2dd2e0adfcb3d2ab6ff9 jdk8-b51
e8569a473cee7f4955bd9e76a9bdf6c6a07ced27 jdk8-b52
2c6933c5106b81a8578b70996fe5b735fb3adb60 jdk8-b53
70ad0ed1d6cef0e7712690d1bab21e4769708aad jdk8-b54
1f3f4b333341873f00da3dee85e4879f0e89c9bb jdk8-b55
2e9eeef2909b33c9224a024afddb61ccb0b77f14 jdk8-b56
make/common/Defs.gmk
浏览文件 @
c6552bbb
...
...
@@ -542,6 +542,21 @@ CFLAGS_$(VARIANT)/BYFILE = $(CFLAGS_$(VARIANT)/$(@F)) \
CXXFLAGS_$(VARIANT)/BYFILE = $(CXXFLAGS_$(VARIANT)/$(@F)) \
$(CXXFLAGS_$(VARIANT)$(CXXFLAGS_$(VARIANT)/$(@F)))
# Command line define to provide basename of file being compiled to source.
# The C macro THIS_FILE can replace the use of __FILE__ in the source
# files for the current filename being compiled.
# The value of the __FILE__ macro is unpredictable and can be anything
# from a relative path to a full path, THIS_FILE will be more consistent..
# The THIS_FILE macro will always be just the basename of the file being
# compiled.
# Different string literals in the the object files makes it difficult to
# compare shared libraries from different builds.
#
# NOTE: If the THIS_FILE macro is actually expanded while in an included
# source file, it will not return the name of the included file.
#
CPP_THIS_FILE = -DTHIS_FILE='"$(<F)"'
#
# Tool flags
#
...
...
@@ -551,7 +566,7 @@ ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS)
CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(EXTRA_CFLAGS)
CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) $(EXTRA_CFLAGS)
CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
$(DEFINES) $(OPTIONS:%=-D%)
$(DEFINES) $(OPTIONS:%=-D%)
$(CPP_THIS_FILE)
LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS)
LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON)
LINTFLAGS = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \
...
...
make/common/Demo.gmk
浏览文件 @
c6552bbb
...
...
@@ -320,10 +320,10 @@ $(DEMO_LIBRARY): $(DEMO_FULL_OBJECTS)
ifeq ($(PLATFORM),windows)
$(RC) $(RC_FLAGS) $(CC_OBJECT_OUTPUT_FLAG)$(DEMO_VERSION_INFO) $(VERSIONINFO_RESOURCE)
$(LINK.demo) $(SHARED_LIBRARY_FLAG) -Fe$@ \
$(
DEMO_FULL_OBJECTS
) $(LDLIBS.demo)
$(
sort $(DEMO_FULL_OBJECTS)
) $(LDLIBS.demo)
else
$(LINK.demo) $(SHARED_LIBRARY_FLAG) -o $@ \
$(
DEMO_FULL_OBJECTS
) $(LDLIBS.demo)
$(
sort $(DEMO_FULL_OBJECTS)
) $(LDLIBS.demo)
endif
@$(call binary_file_verification,$@)
...
...
make/common/Library.gmk
浏览文件 @
c6552bbb
...
...
@@ -199,7 +199,7 @@ endif # LIBRARY
$(OBJDIR)/$(LIBRARY).lcf: $(OBJDIR)/$(LIBRARY).res $(COMPILE_FILES_o) $(FILES_m)
@$(prep-target)
@$(MKDIR) -p $(TEMPDIR)
@$(ECHO) $(
FILES_o
) > $@
@$(ECHO) $(
sort $(FILES_o)
) > $@
ifndef LOCAL_RESOURCE_FILE
@$(ECHO) $(OBJDIR)/$(LIBRARY).res >> $@
endif
...
...
@@ -256,9 +256,9 @@ $(ACTUAL_LIBRARY):: $(COMPILE_FILES_o) $(FILES_m) $(FILES_reorder)
@$(ECHO) "STATS: LIBRARY=$(LIBRARY), PRODUCT=$(PRODUCT), OPTIMIZATION_LEVEL=$(OPTIMIZATION_LEVEL)"
@$(ECHO) "Rebuilding $@ because of $?"
ifeq ($(LIBRARY), fdlibm)
$(AR) $(ARFLAGS) $@ $(
FILES_o
)
$(AR) $(ARFLAGS) $@ $(
sort $(FILES_o)
)
else # LIBRARY
$(LINKER) $(SHARED_LIBRARY_FLAG) -o $@ $(
FILES_o
) $(LDLIBS)
$(LINKER) $(SHARED_LIBRARY_FLAG) -o $@ $(
sort $(FILES_o)
) $(LDLIBS)
@$(call binary_file_verification,$@)
ifeq ($(WRITE_LIBVERSION),true)
$(MCS) -d -a "$(FULL_VERSION)" $@
...
...
make/common/Program.gmk
浏览文件 @
c6552bbb
...
...
@@ -262,7 +262,7 @@ else
$(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...};
@$(MKDIR) -p $(TEMPDIR)
$(LINK_PRE_CMD) $(CC) $(CC_OBJECT_OUTPUT_FLAG)$@ $(LDFLAGS) \
$(
FILES_o
) $(THREADLIBS) $(LDLIBS)
$(
sort $(FILES_o)
) $(THREADLIBS) $(LDLIBS)
ifeq ($(findstring privileged, $(INFO_PLIST_FILE)), privileged)
-codesign -s openjdk_codesign $@
endif
...
...
@@ -392,8 +392,6 @@ VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
VERSION_DEFINES += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
-DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"'
$(OBJDIR)/main.$(OBJECT_SUFFIX): $(LAUNCHER_SHARE_SRC)/bin/main.c
@$(prep-target)
$(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$(OBJDIR)/main.$(OBJECT_SUFFIX) \
...
...
make/docs/Makefile
浏览文件 @
c6552bbb
...
...
@@ -73,7 +73,7 @@ ifeq ($(ARCH_DATA_MODEL),64)
else
ifeq
($(ARCH),universal)
MAX_VM_MEMORY
=
1024
else
MAX_VM_MEMORY
=
612
MAX_VM_MEMORY
=
768
endif
# List of all possible directories for javadoc to look for sources
...
...
make/sun/security/ec/Makefile
浏览文件 @
c6552bbb
...
...
@@ -128,7 +128,6 @@ AUTO_FILES_JAVA_DIRS = $(PKGDIR)
# Exclude the sources that get built by ../other/Makefile
#
AUTO_JAVA_PRUNE
=
\
ECKeyFactory.java
\
ECParameters.java
\
ECPrivateKeyImpl.java
\
ECPublicKeyImpl.java
\
...
...
make/sun/security/other/Makefile
浏览文件 @
c6552bbb
...
...
@@ -53,7 +53,6 @@ AUTO_FILES_JAVA_DIRS = \
# EC classes used by the packages above
#
FILES_java
+=
\
sun/security/ec/ECKeyFactory.java
\
sun/security/ec/ECParameters.java
\
sun/security/ec/ECPrivateKeyImpl.java
\
sun/security/ec/ECPublicKeyImpl.java
\
...
...
src/macosx/native/com/apple/laf/ScreenMenu.m
浏览文件 @
c6552bbb
...
...
@@ -37,7 +37,11 @@
#import "ThreadUtilities.h"
#import "CMenuBar.h"
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
static
JNF_CLASS_CACHE
(
sjc_ScreenMenu
,
"com/apple/laf/ScreenMenu"
);
static
jint
ns2awtModifiers
(
NSUInteger
keyMods
)
{
...
...
@@ -97,7 +101,7 @@ static jint ns2awtMouseButton(NSInteger mouseButton) {
{
if
(
self
.
javaObjectWrapper
==
nil
)
{
#ifdef DEBUG
NSLog
(
@"_javaObject is NULL: (%s - %s : %d)"
,
__FILE__
,
__FUNCTION__
,
__LINE__
);
NSLog
(
@"_javaObject is NULL: (%s - %s : %d)"
,
THIS_FILE
,
__FUNCTION__
,
__LINE__
);
#endif
return
;
}
...
...
@@ -115,7 +119,7 @@ JNF_COCOA_EXIT(env);
{
if
(
self
.
javaObjectWrapper
==
nil
)
{
#ifdef DEBUG
NSLog
(
@"_javaObject is NULL: (%s - %s : %d)"
,
__FILE__
,
__FUNCTION__
,
__LINE__
);
NSLog
(
@"_javaObject is NULL: (%s - %s : %d)"
,
THIS_FILE
,
__FUNCTION__
,
__LINE__
);
#endif
return
;
}
...
...
@@ -133,7 +137,7 @@ JNF_COCOA_EXIT(env);
{
if
(
self
.
javaObjectWrapper
==
nil
)
{
#ifdef DEBUG
NSLog
(
@"_javaObject is NULL: (%s - %s : %d)"
,
__FILE__
,
__FUNCTION__
,
__LINE__
);
NSLog
(
@"_javaObject is NULL: (%s - %s : %d)"
,
THIS_FILE
,
__FUNCTION__
,
__LINE__
);
#endif
return
;
}
...
...
src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiOut.c
浏览文件 @
c6552bbb
...
...
@@ -26,6 +26,11 @@
//#define USE_ERROR
//#define USE_TRACE
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
#if USE_PLATFORM_MIDI_OUT == TRUE
#include "PLATFORM_API_MacOSX_MidiUtils.h"
...
...
@@ -128,7 +133,7 @@ INT32 MIDI_OUT_SendShortMessage(MidiDeviceHandle* handle, UINT32 packedMsg, UINT
case
0xF7
:
// System exclusive
fprintf
(
stderr
,
"%s: %d->internal error: sysex message status=0x%X while sending short message
\n
"
,
__FILE__
,
__LINE__
,
data
[
0
]);
THIS_FILE
,
__LINE__
,
data
[
0
]);
byteIsInvalid
=
TRUE
;
break
;
...
...
@@ -154,7 +159,7 @@ INT32 MIDI_OUT_SendShortMessage(MidiDeviceHandle* handle, UINT32 packedMsg, UINT
default:
// Invalid message
fprintf
(
stderr
,
"%s: %d->Invalid message: message status=0x%X while sending short message
\n
"
,
__FILE__
,
__LINE__
,
data
[
0
]);
THIS_FILE
,
__LINE__
,
data
[
0
]);
byteIsInvalid
=
TRUE
;
break
;
}
...
...
@@ -164,7 +169,7 @@ INT32 MIDI_OUT_SendShortMessage(MidiDeviceHandle* handle, UINT32 packedMsg, UINT
default:
// This can't happen, but handle it anyway.
fprintf
(
stderr
,
"%s: %d->Invalid message: message status=0x%X while sending short message
\n
"
,
__FILE__
,
__LINE__
,
data
[
0
]);
THIS_FILE
,
__LINE__
,
data
[
0
]);
byteIsInvalid
=
TRUE
;
break
;
}
...
...
src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiUtils.c
浏览文件 @
c6552bbb
...
...
@@ -42,6 +42,11 @@
//#define USE_ERROR
//#define USE_TRACE
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
#if (USE_PLATFORM_MIDI_IN == TRUE) || (USE_PLATFORM_MIDI_OUT == TRUE)
#include "PLATFORM_API_MacOSX_MidiUtils.h"
...
...
@@ -317,7 +322,7 @@ static void processMessagesForPacket(const MIDIPacket* packet, MacMidiDeviceHand
packedMsg
=
pendingMessageStatus
|
pendingData
[
0
]
<<
8
;
}
else
{
fprintf
(
stderr
,
"%s: %d->internal error: pendingMessageStatus=0x%X, pendingDataLength=%d
\n
"
,
__FILE__
,
__LINE__
,
pendingMessageStatus
,
pendingDataLength
);
THIS_FILE
,
__LINE__
,
pendingMessageStatus
,
pendingDataLength
);
byteIsInvalid
=
TRUE
;
}
pendingDataLength
=
0
;
...
...
src/macosx/native/sun/awt/CSystemColors.m
浏览文件 @
c6552bbb
...
...
@@ -33,6 +33,11 @@
#import "ThreadUtilities.h"
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
NSColor
**
sColors
=
nil
;
NSColor
**
appleColors
=
nil
;
...
...
@@ -130,7 +135,7 @@ static JNF_STATIC_MEMBER_CACHE(jm_systemColorsChanged, jc_LWCToolkit, "systemCol
result
=
(
useAppleColor
?
appleColors
:
sColors
)[
colorIndex
];
}
else
{
NSLog
(
@"%s: %s %sColor: %ld not found, returning black."
,
__FILE__
,
__FUNCTION__
,
(
useAppleColor
)
?
"Apple"
:
"System"
,
colorIndex
);
NSLog
(
@"%s: %s %sColor: %ld not found, returning black."
,
THIS_FILE
,
__FUNCTION__
,
(
useAppleColor
)
?
"Apple"
:
"System"
,
colorIndex
);
result
=
[
NSColor
blackColor
];
}
...
...
src/macosx/native/sun/awt/CTextPipe.m
浏览文件 @
c6552bbb
...
...
@@ -36,6 +36,10 @@
#import "QuartzSurfaceData.h"
#include "AWTStrike.h"
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
static
const
CGAffineTransform
sInverseTX
=
{
1
,
0
,
0
,
-
1
,
0
,
0
};
...
...
@@ -488,7 +492,7 @@ static inline void doDrawGlyphsPipe_getGlyphVectorLengthAndAlloc
if
(
glyphs
==
NULL
||
advances
==
NULL
)
{
(
*
env
)
->
DeleteLocalRef
(
env
,
glyphsArray
);
[
NSException
raise
:
NSMallocException
format
:
@"%s-%s:%d"
,
__FILE__
,
__FUNCTION__
,
__LINE__
];
[
NSException
raise
:
NSMallocException
format
:
@"%s-%s:%d"
,
THIS_FILE
,
__FUNCTION__
,
__LINE__
];
return
;
}
...
...
src/macosx/native/sun/awt/ImageSurfaceData.h
浏览文件 @
c6552bbb
...
...
@@ -41,7 +41,7 @@ void UnlockImagePixels(JNIEnv* env, ImageSDOps* isdo);
// If there is an image present, this is a no-op
void
makeSureImageIsCreated
(
ImageSDOps
*
isdo
);
struct
_ContextInfo
typedef
struct
_ContextInfo
{
BOOL
useWindowContextReference
;
BOOL
canUseJavaPixelsAsContext
;
...
...
@@ -50,10 +50,9 @@ struct _ContextInfo
size_t
bytesPerRow
;
CGImageAlphaInfo
alphaInfo
;
CGColorSpaceRef
colorSpace
;
}
typedef
ContextInfo
;
}
ContextInfo
;
struct
_ImageInfo
typedef
struct
_ImageInfo
{
size_t
bitsPerComponent
;
size_t
bitsPerPixel
;
...
...
@@ -61,8 +60,7 @@ struct _ImageInfo
size_t
bytesPerRow
;
CGImageAlphaInfo
alphaInfo
;
CGColorSpaceRef
colorSpace
;
}
typedef
ImageInfo
;
}
ImageInfo
;
struct
_ImageSDOps
{
...
...
src/macosx/native/sun/awt/ImageSurfaceData.m
浏览文件 @
c6552bbb
...
...
@@ -53,10 +53,6 @@
//
for
vImage
framework
headers
#include
<
Accelerate
/
Accelerate
.
h
>
//
private
Quartz
routines
needed
here
CG
_
EXTERN
void
CGContextSetCTM
(
CGContextRef
ref
,
CGAffineTransform
tx
)
;
static
ContextInfo
sDefaultContextInfo
[
sun
_
java2d
_
OSXOffScreenSurfaceData
_
TYPE
_
3
BYTE
_
RGB
+
1
]
=
{
{
YES
,
YES
,
8
,
4
,
0
,
kCGImageAlphaPremultipliedFirst
|
kCGBitmapByteOrder32Host
,
NULL
}
,
//
TYPE
_
CUSTOM
//
special
case
...
...
@@ -942,7 +938,6 @@ PRINT("createContext")
//
intitalize
the
context
to
match
the
Java
coordinate
system
//
BG
,
since
the
context
is
created
above
,
we
can
just
concat
//
CGContextSetCTM
(
qsdo
->
cgRef
,
CGAffineTransformMake
(
1
,
0
,
0
,
-
1
,
0
,
isdo
->
height
))
;
CGContextConcatCTM
(
qsdo
->
cgRef
,
CGAffineTransformMake
(
1
,
0
,
0
,
-
1
,
0
,
isdo
->
height
))
;
CGContextSaveGState
(
qsdo
->
cgRef
)
;
//
this
will
make
sure
we
don
'
t
go
pass
device
context
settings
...
...
@@ -1114,7 +1109,10 @@ PRINT("syncFromJavaPixels")
if
(
qsdo
->
cgRef
!=
NULL
)
{
CGContextSaveGState
(
qsdo
->
cgRef
)
;
CGContextSetCTM
(
qsdo
->
cgRef
,
CGAffineTransformMake
(
1
,
0
,
0
,
1
,
0
,
0
))
;
CGAffineTransform
currCTM
=
CGContextGetCTM
(
qsdo
->
cgRef
)
;
CGAffineTransform
inverse
=
CGAffineTransformInvert
(
currCTM
)
;
CGContextConcatCTM
(
qsdo
->
cgRef
,
inverse
)
;
CGContextConcatCTM
(
qsdo
->
cgRef
,
CGAffineTransformMake
(
1
,
0
,
0
,
1
,
0
,
0
))
;
CGContextSetBlendMode
(
qsdo
->
cgRef
,
kCGBlendModeCopy
)
;
CGContextSetAlpha
(
qsdo
->
cgRef
,
1.0
f
)
;
CGContextDrawImage
(
qsdo
->
cgRef
,
CGRectMake
(
0
,
0
,
width
,
height
)
,
javaImg
)
;
...
...
src/macosx/native/sun/awt/QuartzRenderer.m
浏览文件 @
c6552bbb
...
...
@@ -50,9 +50,6 @@
//
same
value
as
defined
in
Sun
'
s
own
code
#define
XOR
_
ALPHA
_
CUTOFF
128
//
private
Quartz
routines
needed
here
CG
_
EXTERN
void
CGContextSetCTM
(
CGContextRef
ref
,
CGAffineTransform
tx
)
;
static
CGFloat
gRoundRectCtrlpts
[
10
][
12
]
=
{
...
...
@@ -536,7 +533,7 @@ QUARTZ_RENDERER_INLINE void doImageCG(JNIEnv *env, CGContextRef cgRef, jobject i
makeSureImageIsCreated(isdo);
CG
AffineTransform ctm = CGContextGetCTM
(cgRef);
CG
ContextSaveGState
(cgRef);
CGContextConcatCTM(cgRef, CGAffineTransformMake(a, b, c, d, tx, ty));
jint alphaInfo = isdo->contextInfo.alphaInfo & kCGBitmapAlphaInfoMask;
...
...
@@ -551,7 +548,7 @@ QUARTZ_RENDERER_INLINE void doImageCG(JNIEnv *env, CGContextRef cgRef, jobject i
CGImageRelease(subImg);
}
CGContext
SetCTM(cgRef, ctm
);
CGContext
RestoreGState(cgRef
);
UnlockImage(env, isdo);
}
...
...
src/macosx/native/sun/awt/QuartzSurfaceData.m
浏览文件 @
c6552bbb
...
...
@@ -40,9 +40,6 @@
#import
<
AppKit
/
AppKit
.
h
>
#import
"ThreadUtilities.h"
//
private
Quartz
routines
needed
here
CG
_
EXTERN
void
CGContextSetCTM
(
CGContextRef
ref
,
CGAffineTransform
tx
)
;
//
#define
DEBUG
#if
defined
DEBUG
#define
PRINT
(
msg
)
{
fprintf
(
stderr
,
"%s\n"
,
msg
)
;
}
...
...
@@ -50,9 +47,6 @@ CG_EXTERN void CGContextSetCTM(CGContextRef ref, CGAffineTransform tx);
#define
PRINT
(
msg
)
{}
#endif
//
from
CGAffineTransformPrivate
.
h
extern
CGPoint
CGPointApplyInverseAffineTransform
(
CGPoint
point
,
CGAffineTransform
t
)
;
#define
kOffset
(
0.5
f
)
BOOL
gAdjustForJavaDrawing
;
...
...
@@ -608,7 +602,8 @@ PRINT(" SetUpCGContext")
// We need to flip both y coefficeints to flip the offset point into the java coordinate system.
ctm.b = -ctm.b; ctm.d = -ctm.d; ctm.tx = 0.0f; ctm.ty = 0.0f;
CGPoint offsets = {kOffset, kOffset};
offsets = CGPointApplyInverseAffineTransform(offsets, ctm);
CGAffineTransform inverse = CGAffineTransformInvert(ctm);
offsets = CGPointApplyAffineTransform(offsets, inverse);
qsdo->graphicsStateInfo.offsetX = offsets.x;
qsdo->graphicsStateInfo.offsetY = offsets.y;
}
...
...
src/macosx/native/sun/font/AWTStrike.m
浏览文件 @
c6552bbb
...
...
@@ -33,6 +33,11 @@
#import "CoreTextSupport.h"
//#import "jni_util.h"
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
@implementation
AWTStrike
static
CGAffineTransform
sInverseTX
=
{
1
,
0
,
0
,
-
1
,
0
,
0
};
...
...
@@ -102,7 +107,7 @@ static CGAffineTransform sInverseTX = { 1, 0, 0, -1, 0, 0 };
#define AWT_FONT_CLEANUP_FINISH \
if (_fontThrowJavaException == YES) { \
char s[512]; \
sprintf(s, "%s-%s:%d",
__FILE__
, __FUNCTION__, __LINE__); \
sprintf(s, "%s-%s:%d",
THIS_FILE
, __FUNCTION__, __LINE__); \
[JNFException raise:env as:kRuntimeException reason:s]; \
}
...
...
src/share/back/error_messages.h
浏览文件 @
c6552bbb
...
...
@@ -42,31 +42,36 @@ const char * jvmtiErrorText(jvmtiError);
const
char
*
eventText
(
int
);
const
char
*
jdwpErrorText
(
jdwpError
);
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
#define EXIT_ERROR(error,msg) \
{ \
print_message(stderr, "JDWP exit error ", "\n", \
"%s(%d): %s [%s:%d]", \
jvmtiErrorText((jvmtiError)error), error, (msg==NULL?"":msg), \
__FILE__
, __LINE__); \
THIS_FILE
, __LINE__); \
debugInit_exit((jvmtiError)error, msg); \
}
#define JDI_ASSERT(expression) \
do { \
if (gdata && gdata->assertOn && !(expression)) { \
jdiAssertionFailed(
__FILE__
, __LINE__, #expression); \
jdiAssertionFailed(
THIS_FILE
, __LINE__, #expression); \
} \
} while (0)
#define JDI_ASSERT_MSG(expression, msg) \
do { \
if (gdata && gdata->assertOn && !(expression)) { \
jdiAssertionFailed(
__FILE__
, __LINE__, msg); \
jdiAssertionFailed(
THIS_FILE
, __LINE__, msg); \
} \
} while (0)
#define JDI_ASSERT_FAILED(msg) \
jdiAssertionFailed(
__FILE__
, __LINE__, msg)
jdiAssertionFailed(
THIS_FILE
, __LINE__, msg)
void
do_pause
(
void
);
...
...
src/share/back/log_messages.h
浏览文件 @
c6552bbb
...
...
@@ -33,11 +33,15 @@ void finish_logging(int);
#define LOG_NULL ((void)0)
#ifdef JDWP_LOGGING
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
#ifdef JDWP_LOGGING
#define _LOG(flavor,args) \
(log_message_begin(flavor,
__FILE__
,__LINE__), \
(log_message_begin(flavor,
THIS_FILE
,__LINE__), \
log_message_end args)
#define LOG_TEST(flag) (gdata->log_flags & (flag))
...
...
src/share/bin/jli_util.h
浏览文件 @
c6552bbb
...
...
@@ -68,12 +68,23 @@ int JLI_GetStdArgc();
#define JLI_StrNCaseCmp(p1, p2, p3) strnicmp((p1), (p2), (p3))
#define JLI_Snprintf _snprintf
void
JLI_CmdToArgs
(
char
*
cmdline
);
#else
#define JLI_Lseek _lseeki64
#else
/* NIXES */
#include <unistd.h>
#include <strings.h>
#define JLI_StrCaseCmp(p1, p2) strcasecmp((p1), (p2))
#define JLI_StrNCaseCmp(p1, p2, p3) strncasecmp((p1), (p2), (p3))
#define JLI_Snprintf snprintf
#ifdef __solaris__
#define JLI_Lseek llseek
#endif
#ifdef __linux__
#define _LARGFILE64_SOURCE
#define JLI_Lseek lseek64
#endif
#ifdef MACOSX
#define JLI_Lseek lseek
#endif
#endif
/* _WIN32 */
/*
...
...
src/share/bin/manifest_info.h
浏览文件 @
c6552bbb
/*
* Copyright (c) 2003, 20
05
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 20
12
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -37,6 +37,8 @@
#define CENSIG 0x02014b50L
/* "PK\001\002" */
#define ENDSIG 0x06054b50L
/* "PK\005\006" */
#define ZIP64_ENDSIG 0x06064b50L
/* "PK\006\006" */
#define ZIP64_LOCSIG 0x07064b50L
/* "PK\006\007" */
/*
* Header sizes including signatures
*/
...
...
@@ -45,12 +47,21 @@
#define CENHDR 46
#define ENDHDR 22
#define ZIP64_ENDHDR 56 // ZIP64 end header size
#define ZIP64_LOCHDR 20 // ZIP64 end loc header size
#define ZIP64_EXTHDR 24 // EXT header size
#define ZIP64_EXTID 1 // Extra field Zip64 header ID
#define ZIP64_MAGICVAL 0xffffffffLL
#define ZIP64_MAGICCOUNT 0xffff
/*
* Header field access macros
*/
#define CH(b, n) (((unsigned char *)(b))[n])
#define SH(b, n) (CH(b, n) | (CH(b, n+1) << 8))
#define LG(b, n) (SH(b, n) | (SH(b, n+2) << 16))
#define LG(b, n) ((SH(b, n) | (SH(b, n+2) << 16)) &0xffffffffUL)
#define LL(b, n) (((jlong)LG(b, n)) | (((jlong)LG(b, n+4)) << 32))
#define GETSIG(b) LG(b, 0)
/*
...
...
@@ -101,6 +112,26 @@
#define ENDOFF(b) LG(b, 16)
/* central directory offset */
#define ENDCOM(b) SH(b, 20)
/* size of zip file comment */
/*
* Macros for getting Zip64 end of central directory header fields
*/
#define ZIP64_ENDLEN(b) LL(b, 4)
/* size of zip64 end of central dir */
#define ZIP64_ENDVEM(b) SH(b, 12)
/* version made by */
#define ZIP64_ENDVER(b) SH(b, 14)
/* version needed to extract */
#define ZIP64_ENDNMD(b) LG(b, 16)
/* number of this disk */
#define ZIP64_ENDDSK(b) LG(b, 20)
/* disk number of start */
#define ZIP64_ENDTOD(b) LL(b, 24)
/* total number of entries on this disk */
#define ZIP64_ENDTOT(b) LL(b, 32)
/* total number of entries */
#define ZIP64_ENDSIZ(b) LL(b, 40)
/* central directory size in bytes */
#define ZIP64_ENDOFF(b) LL(b, 48)
/* offset of first CEN header */
/*
* Macros for getting Zip64 end of central directory locator fields
*/
#define ZIP64_LOCDSK(b) LG(b, 4)
/* disk number start */
#define ZIP64_LOCOFF(b) LL(b, 8)
/* offset of zip64 end */
#define ZIP64_LOCTOT(b) LG(b, 16)
/* total number of disks */
/*
* A comment of maximum length of 64kb can follow the END record. This
* is the furthest the END record can be from the end of the file.
...
...
@@ -119,7 +150,7 @@
typedef
struct
zentry
{
/* Zip file entry */
size_t
isize
;
/* size of inflated data */
size_t
csize
;
/* size of compressed data (zero if uncompressed) */
off_t
offset
;
/* position of compressed data */
jlong
offset
;
/* position of compressed data */
int
how
;
/* compression method (if any) */
}
zentry
;
...
...
src/share/bin/parse_manifest.c
浏览文件 @
c6552bbb
/*
* Copyright (c) 2003, 201
0
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 201
2
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -61,7 +61,7 @@ inflate_file(int fd, zentry *entry, int *size_out)
if
(
entry
->
csize
==
(
size_t
)
-
1
||
entry
->
isize
==
(
size_t
)
-
1
)
return
(
NULL
);
if
(
lseek
(
fd
,
entry
->
offset
,
SEEK_SET
)
<
(
off_t
)
0
)
if
(
JLI_Lseek
(
fd
,
entry
->
offset
,
SEEK_SET
)
<
(
jlong
)
0
)
return
(
NULL
);
if
((
in
=
malloc
(
entry
->
csize
+
1
))
==
NULL
)
return
(
NULL
);
...
...
@@ -110,6 +110,38 @@ inflate_file(int fd, zentry *entry, int *size_out)
return
(
NULL
);
}
static
jboolean
zip64_present
=
JNI_FALSE
;
/*
* Checks to see if we have ZIP64 archive, and save
* the check for later use
*/
static
int
haveZIP64
(
Byte
*
p
)
{
jlong
cenlen
,
cenoff
,
centot
;
cenlen
=
ENDSIZ
(
p
);
cenoff
=
ENDOFF
(
p
);
centot
=
ENDTOT
(
p
);
zip64_present
=
(
cenlen
==
ZIP64_MAGICVAL
||
cenoff
==
ZIP64_MAGICVAL
||
centot
==
ZIP64_MAGICCOUNT
);
return
zip64_present
;
}
static
jlong
find_end64
(
int
fd
,
Byte
*
ep
,
jlong
pos
)
{
jlong
end64pos
;
jlong
bytes
;
if
((
end64pos
=
JLI_Lseek
(
fd
,
pos
-
ZIP64_LOCHDR
,
SEEK_SET
))
<
(
jlong
)
0
)
return
-
1
;
if
((
bytes
=
read
(
fd
,
ep
,
ZIP64_LOCHDR
))
<
0
)
return
-
1
;
if
(
GETSIG
(
ep
)
==
ZIP64_LOCSIG
)
return
end64pos
;
return
-
1
;
}
/*
* A very little used routine to handle the case that zip file has
* a comment at the end. Believe it or not, the only way to find the
...
...
@@ -122,12 +154,12 @@ inflate_file(int fd, zentry *entry, int *size_out)
* Returns the offset of the END record in the file on success,
* -1 on failure.
*/
static
off_t
static
jlong
find_end
(
int
fd
,
Byte
*
eb
)
{
off_t
len
;
off_t
pos
;
off_t
flen
;
jlong
len
;
jlong
pos
;
jlong
flen
;
int
bytes
;
Byte
*
cp
;
Byte
*
endpos
;
...
...
@@ -136,14 +168,16 @@ find_end(int fd, Byte *eb)
/*
* 99.44% (or more) of the time, there will be no comment at the
* end of the zip file. Try reading just enough to read the END
* record from the end of the file.
* record from the end of the file, at this time we should also
* check to see if we have a ZIP64 archive.
*/
if
((
pos
=
lseek
(
fd
,
-
ENDHDR
,
SEEK_END
))
<
(
off_t
)
0
)
if
((
pos
=
JLI_Lseek
(
fd
,
-
ENDHDR
,
SEEK_END
))
<
(
jlong
)
0
)
return
(
-
1
);
if
((
bytes
=
read
(
fd
,
eb
,
ENDHDR
))
<
0
)
return
(
-
1
);
if
(
GETSIG
(
eb
)
==
ENDSIG
)
return
(
pos
);
if
(
GETSIG
(
eb
)
==
ENDSIG
)
{
return
haveZIP64
(
eb
)
?
find_end64
(
fd
,
eb
,
pos
)
:
pos
;
}
/*
* Shucky-Darn,... There is a comment at the end of the zip file.
...
...
@@ -151,10 +185,10 @@ find_end(int fd, Byte *eb)
* Allocate and fill a buffer with enough of the zip file
* to meet the specification for a maximal comment length.
*/
if
((
flen
=
lseek
(
fd
,
0
,
SEEK_END
))
<
(
off_t
)
0
)
if
((
flen
=
JLI_Lseek
(
fd
,
0
,
SEEK_END
))
<
(
jlong
)
0
)
return
(
-
1
);
len
=
(
flen
<
END_MAXLEN
)
?
flen
:
END_MAXLEN
;
if
(
lseek
(
fd
,
-
len
,
SEEK_END
)
<
(
off_t
)
0
)
if
(
JLI_Lseek
(
fd
,
-
len
,
SEEK_END
)
<
(
jlong
)
0
)
return
(
-
1
);
if
((
buffer
=
malloc
(
END_MAXLEN
))
==
NULL
)
return
(
-
1
);
...
...
@@ -175,12 +209,92 @@ find_end(int fd, Byte *eb)
(
cp
+
ENDHDR
+
ENDCOM
(
cp
)
==
endpos
))
{
(
void
)
memcpy
(
eb
,
cp
,
ENDHDR
);
free
(
buffer
);
return
(
flen
-
(
endpos
-
cp
));
pos
=
flen
-
(
endpos
-
cp
);
return
haveZIP64
(
eb
)
?
find_end64
(
fd
,
eb
,
pos
)
:
pos
;
}
free
(
buffer
);
return
(
-
1
);
}
#define BUFSIZE (3 * 65536 + CENHDR + SIGSIZ)
#define MINREAD 1024
/*
* Computes and positions at the start of the CEN header, ie. the central
* directory, this will also return the offset if there is a zip file comment
* at the end of the archive, for most cases this would be 0.
*/
static
jlong
compute_cen
(
int
fd
,
Byte
*
bp
)
{
int
bytes
;
Byte
*
p
;
jlong
base_offset
;
jlong
offset
;
char
buffer
[
MINREAD
];
p
=
buffer
;
/*
* Read the END Header, which is the starting point for ZIP files.
* (Clearly designed to make writing a zip file easier than reading
* one. Now isn't that precious...)
*/
if
((
base_offset
=
find_end
(
fd
,
bp
))
==
-
1
)
{
return
(
-
1
);
}
p
=
bp
;
/*
* There is a historical, but undocumented, ability to allow for
* additional "stuff" to be prepended to the zip/jar file. It seems
* that this has been used to prepend an actual java launcher
* executable to the jar on Windows. Although this is just another
* form of statically linking a small piece of the JVM to the
* application, we choose to continue to support it. Note that no
* guarantees have been made (or should be made) to the customer that
* this will continue to work.
*
* Therefore, calculate the base offset of the zip file (within the
* expanded file) by assuming that the central directory is followed
* immediately by the end record.
*/
if
(
zip64_present
)
{
if
((
offset
=
ZIP64_LOCOFF
(
p
))
<
(
jlong
)
0
)
{
return
-
1
;
}
if
(
JLI_Lseek
(
fd
,
offset
,
SEEK_SET
)
<
(
jlong
)
0
)
{
return
(
-
1
);
}
if
((
bytes
=
read
(
fd
,
buffer
,
MINREAD
))
<
0
)
{
return
(
-
1
);
}
if
(
GETSIG
(
buffer
)
!=
ZIP64_ENDSIG
)
{
return
-
1
;
}
if
((
offset
=
ZIP64_ENDOFF
(
buffer
))
<
(
jlong
)
0
)
{
return
-
1
;
}
if
(
JLI_Lseek
(
fd
,
offset
,
SEEK_SET
)
<
(
jlong
)
0
)
{
return
(
-
1
);
}
p
=
buffer
;
base_offset
=
base_offset
-
ZIP64_ENDSIZ
(
p
)
-
ZIP64_ENDOFF
(
p
)
-
ZIP64_ENDHDR
;
}
else
{
base_offset
=
base_offset
-
ENDSIZ
(
p
)
-
ENDOFF
(
p
);
/*
* The END Header indicates the start of the Central Directory
* Headers. Remember that the desired Central Directory Header (CEN)
* will almost always be the second one and the first one is a small
* directory entry ("META-INF/"). Keep the code optimized for
* that case.
*
* Seek to the beginning of the Central Directory.
*/
if
(
JLI_Lseek
(
fd
,
base_offset
+
ENDOFF
(
p
),
SEEK_SET
)
<
(
jlong
)
0
)
{
return
(
-
1
);
}
}
return
base_offset
;
}
/*
* Locate the manifest file with the zip/jar file.
*
...
...
@@ -208,9 +322,6 @@ find_end(int fd, Byte *eb)
* a typical jar file (META-INF and META-INF/MANIFEST.MF). Keep this factoid
* in mind when optimizing this code.
*/
#define BUFSIZE (3 * 65536 + CENHDR + SIGSIZ)
#define MINREAD 1024
static
int
find_file
(
int
fd
,
zentry
*
entry
,
const
char
*
file_name
)
{
...
...
@@ -218,7 +329,7 @@ find_file(int fd, zentry *entry, const char *file_name)
int
res
;
int
entry_size
;
int
read_size
;
int
base_offset
;
jlong
base_offset
;
Byte
*
p
;
Byte
*
bp
;
Byte
*
buffer
;
...
...
@@ -228,54 +339,18 @@ find_file(int fd, zentry *entry, const char *file_name)
return
(
-
1
);
}
p
=
buffer
;
bp
=
buffer
;
/*
* Read the END Header, which is the starting point for ZIP files.
* (Clearly designed to make writing a zip file easier than reading
* one. Now isn't that precious...)
*/
if
((
base_offset
=
find_end
(
fd
,
bp
))
==
-
1
)
{
base_offset
=
compute_cen
(
fd
,
bp
);
if
(
base_offset
==
-
1
)
{
free
(
buffer
);
return
(
-
1
)
;
return
-
1
;
}
/*
* There is a historical, but undocumented, ability to allow for
* additional "stuff" to be prepended to the zip/jar file. It seems
* that this has been used to prepend an actual java launcher
* executable to the jar on Windows. Although this is just another
* form of statically linking a small piece of the JVM to the
* application, we choose to continue to support it. Note that no
* guarantees have been made (or should be made) to the customer that
* this will continue to work.
*
* Therefore, calculate the base offset of the zip file (within the
* expanded file) by assuming that the central directory is followed
* immediately by the end record.
*/
base_offset
=
base_offset
-
ENDSIZ
(
p
)
-
ENDOFF
(
p
);
/*
* The END Header indicates the start of the Central Directory
* Headers. Remember that the desired Central Directory Header (CEN)
* will almost always be the second one and the first one is a small
* directory entry ("META-INF/"). Keep the code optimized for
* that case.
*
* Begin by seeking to the beginning of the Central Directory and
* reading in the first buffer full of bits.
*/
if
(
lseek
(
fd
,
base_offset
+
ENDOFF
(
p
),
SEEK_SET
)
<
(
off_t
)
0
)
{
free
(
buffer
);
return
(
-
1
);
}
if
((
bytes
=
read
(
fd
,
bp
,
MINREAD
))
<
0
)
{
free
(
buffer
);
return
(
-
1
);
}
p
=
bp
;
/*
* Loop through the Central Directory Headers. Note that a valid zip/jar
* must have an ENDHDR (with ENDSIG) after the Central Directory.
...
...
@@ -319,7 +394,7 @@ find_file(int fd, zentry *entry, const char *file_name)
*/
if
((
size_t
)
CENNAM
(
p
)
==
JLI_StrLen
(
file_name
)
&&
memcmp
((
p
+
CENHDR
),
file_name
,
JLI_StrLen
(
file_name
))
==
0
)
{
if
(
lseek
(
fd
,
base_offset
+
CENOFF
(
p
),
SEEK_SET
)
<
(
off_t
)
0
)
{
if
(
JLI_Lseek
(
fd
,
base_offset
+
CENOFF
(
p
),
SEEK_SET
)
<
(
jlong
)
0
)
{
free
(
buffer
);
return
(
-
1
);
}
...
...
@@ -487,6 +562,9 @@ JLI_ParseManifest(char *jarfile, manifest_info *info)
char
*
splashscreen_name
=
NULL
;
if
((
fd
=
open
(
jarfile
,
O_RDONLY
#ifdef O_LARGEFILE
|
O_LARGEFILE
/* large file mode on solaris */
#endif
#ifdef O_BINARY
|
O_BINARY
/* use binary mode on windows */
#endif
...
...
src/share/classes/com/sun/crypto/provider/AESCipher.java
浏览文件 @
c6552bbb
/*
* Copyright (c) 2002, 20
09
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 20
12
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -47,18 +47,122 @@ import javax.crypto.BadPaddingException;
* @see OutputFeedback
*/
public
final
class
AESCipher
extends
CipherSpi
{
abstract
class
AESCipher
extends
CipherSpi
{
public
static
final
class
General
extends
AESCipher
{
public
General
()
{
super
(-
1
);
}
}
abstract
static
class
OidImpl
extends
AESCipher
{
protected
OidImpl
(
int
keySize
,
String
mode
,
String
padding
)
{
super
(
keySize
);
try
{
engineSetMode
(
mode
);
engineSetPadding
(
padding
);
}
catch
(
GeneralSecurityException
gse
)
{
// internal error; re-throw as provider exception
ProviderException
pe
=
new
ProviderException
(
"Internal Error"
);
pe
.
initCause
(
gse
);
throw
pe
;
}
}
}
public
static
final
class
AES128_ECB_NoPadding
extends
OidImpl
{
public
AES128_ECB_NoPadding
()
{
super
(
16
,
"ECB"
,
"NOPADDING"
);
}
}
public
static
final
class
AES192_ECB_NoPadding
extends
OidImpl
{
public
AES192_ECB_NoPadding
()
{
super
(
24
,
"ECB"
,
"NOPADDING"
);
}
}
public
static
final
class
AES256_ECB_NoPadding
extends
OidImpl
{
public
AES256_ECB_NoPadding
()
{
super
(
32
,
"ECB"
,
"NOPADDING"
);
}
}
public
static
final
class
AES128_CBC_NoPadding
extends
OidImpl
{
public
AES128_CBC_NoPadding
()
{
super
(
16
,
"CBC"
,
"NOPADDING"
);
}
}
public
static
final
class
AES192_CBC_NoPadding
extends
OidImpl
{
public
AES192_CBC_NoPadding
()
{
super
(
24
,
"CBC"
,
"NOPADDING"
);
}
}
public
static
final
class
AES256_CBC_NoPadding
extends
OidImpl
{
public
AES256_CBC_NoPadding
()
{
super
(
32
,
"CBC"
,
"NOPADDING"
);
}
}
public
static
final
class
AES128_OFB_NoPadding
extends
OidImpl
{
public
AES128_OFB_NoPadding
()
{
super
(
16
,
"OFB"
,
"NOPADDING"
);
}
}
public
static
final
class
AES192_OFB_NoPadding
extends
OidImpl
{
public
AES192_OFB_NoPadding
()
{
super
(
24
,
"OFB"
,
"NOPADDING"
);
}
}
public
static
final
class
AES256_OFB_NoPadding
extends
OidImpl
{
public
AES256_OFB_NoPadding
()
{
super
(
32
,
"OFB"
,
"NOPADDING"
);
}
}
public
static
final
class
AES128_CFB_NoPadding
extends
OidImpl
{
public
AES128_CFB_NoPadding
()
{
super
(
16
,
"CFB"
,
"NOPADDING"
);
}
}
public
static
final
class
AES192_CFB_NoPadding
extends
OidImpl
{
public
AES192_CFB_NoPadding
()
{
super
(
24
,
"CFB"
,
"NOPADDING"
);
}
}
public
static
final
class
AES256_CFB_NoPadding
extends
OidImpl
{
public
AES256_CFB_NoPadding
()
{
super
(
32
,
"CFB"
,
"NOPADDING"
);
}
}
// utility method used by AESCipher and AESWrapCipher
static
final
void
checkKeySize
(
Key
key
,
int
fixedKeySize
)
throws
InvalidKeyException
{
if
(
fixedKeySize
!=
-
1
)
{
if
(
key
==
null
)
{
throw
new
InvalidKeyException
(
"The key must not be null"
);
}
byte
[]
value
=
key
.
getEncoded
();
if
(
value
==
null
)
{
throw
new
InvalidKeyException
(
"Key encoding must not be null"
);
}
else
if
(
value
.
length
!=
fixedKeySize
)
{
throw
new
InvalidKeyException
(
"The key must be "
+
fixedKeySize
*
8
+
" bits"
);
}
}
}
/*
* internal CipherCore object which does the real work.
*/
private
CipherCore
core
=
null
;
/*
* needed to support AES oids which associates a fixed key size
* to the cipher object.
*/
private
final
int
fixedKeySize
;
// in bytes, -1 if no restriction
/**
* Creates an instance of AES cipher with default ECB mode and
* PKCS5Padding.
*/
p
ublic
AESCipher
(
)
{
p
rotected
AESCipher
(
int
keySize
)
{
core
=
new
CipherCore
(
new
AESCrypt
(),
AESConstants
.
AES_BLOCK_SIZE
);
fixedKeySize
=
keySize
;
}
/**
...
...
@@ -183,6 +287,7 @@ public final class AESCipher extends CipherSpi {
*/
protected
void
engineInit
(
int
opmode
,
Key
key
,
SecureRandom
random
)
throws
InvalidKeyException
{
checkKeySize
(
key
,
fixedKeySize
);
core
.
init
(
opmode
,
key
,
random
);
}
...
...
@@ -214,6 +319,7 @@ public final class AESCipher extends CipherSpi {
AlgorithmParameterSpec
params
,
SecureRandom
random
)
throws
InvalidKeyException
,
InvalidAlgorithmParameterException
{
checkKeySize
(
key
,
fixedKeySize
);
core
.
init
(
opmode
,
key
,
params
,
random
);
}
...
...
@@ -221,6 +327,7 @@ public final class AESCipher extends CipherSpi {
AlgorithmParameters
params
,
SecureRandom
random
)
throws
InvalidKeyException
,
InvalidAlgorithmParameterException
{
checkKeySize
(
key
,
fixedKeySize
);
core
.
init
(
opmode
,
key
,
params
,
random
);
}
...
...
src/share/classes/com/sun/crypto/provider/AESWrapCipher.java
浏览文件 @
c6552bbb
/*
* Copyright (c) 2004, 20
09
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 20
12
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -43,8 +43,27 @@ import javax.crypto.spec.*;
*
* @see AESCipher
*/
public
final
class
AESWrapCipher
extends
CipherSpi
{
abstract
class
AESWrapCipher
extends
CipherSpi
{
public
static
final
class
General
extends
AESWrapCipher
{
public
General
()
{
super
(-
1
);
}
}
public
static
final
class
AES128
extends
AESWrapCipher
{
public
AES128
()
{
super
(
16
);
}
}
public
static
final
class
AES192
extends
AESWrapCipher
{
public
AES192
()
{
super
(
24
);
}
}
public
static
final
class
AES256
extends
AESWrapCipher
{
public
AES256
()
{
super
(
32
);
}
}
private
static
final
byte
[]
IV
=
{
(
byte
)
0xA6
,
(
byte
)
0xA6
,
(
byte
)
0xA6
,
(
byte
)
0xA6
,
(
byte
)
0xA6
,
(
byte
)
0xA6
,
(
byte
)
0xA6
,
(
byte
)
0xA6
...
...
@@ -62,12 +81,20 @@ public final class AESWrapCipher extends CipherSpi {
*/
private
boolean
decrypting
=
false
;
/*
* needed to support AES oids which associates a fixed key size
* to the cipher object.
*/
private
final
int
fixedKeySize
;
// in bytes, -1 if no restriction
/**
* Creates an instance of AES KeyWrap cipher with default
* mode, i.e. "ECB" and padding scheme, i.e. "NoPadding".
*/
public
AESWrapCipher
()
{
public
AESWrapCipher
(
int
keySize
)
{
cipher
=
new
AESCrypt
();
fixedKeySize
=
keySize
;
}
/**
...
...
@@ -170,6 +197,7 @@ public final class AESWrapCipher extends CipherSpi {
throw
new
UnsupportedOperationException
(
"This cipher can "
+
"only be used for key wrapping and unwrapping"
);
}
AESCipher
.
checkKeySize
(
key
,
fixedKeySize
);
cipher
.
init
(
decrypting
,
key
.
getAlgorithm
(),
key
.
getEncoded
());
}
...
...
src/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java
浏览文件 @
c6552bbb
/*
* Copyright (c) 1997, 20
07
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 20
12
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -80,10 +80,10 @@ public final class DHKeyPairGenerator extends KeyPairGeneratorSpi {
* @param random the source of randomness
*/
public
void
initialize
(
int
keysize
,
SecureRandom
random
)
{
if
((
keysize
<
512
)
||
(
keysize
>
1024
)
||
(
keysize
%
64
!=
0
))
{
if
((
keysize
<
512
)
||
(
keysize
>
2048
)
||
(
keysize
%
64
!=
0
))
{
throw
new
InvalidParameterException
(
"Keysize must be multiple "
+
"of 64, and can only range "
+
"from 512 to
1024
"
+
"from 512 to
2048
"
+
"(inclusive)"
);
}
this
.
pSize
=
keysize
;
...
...
@@ -115,11 +115,11 @@ public final class DHKeyPairGenerator extends KeyPairGeneratorSpi {
params
=
(
DHParameterSpec
)
algParams
;
pSize
=
params
.
getP
().
bitLength
();
if
((
pSize
<
512
)
||
(
pSize
>
1024
)
||
if
((
pSize
<
512
)
||
(
pSize
>
2048
)
||
(
pSize
%
64
!=
0
))
{
throw
new
InvalidAlgorithmParameterException
(
"Prime size must be multiple of 64, and can only range "
+
"from 512 to
1024
(inclusive)"
);
+
"from 512 to
2048
(inclusive)"
);
}
// exponent size is optional, could be 0
...
...
@@ -156,10 +156,11 @@ public final class DHKeyPairGenerator extends KeyPairGeneratorSpi {
BigInteger
g
=
params
.
getG
();
if
(
lSize
<=
0
)
{
lSize
=
pSize
>>
1
;
// use an exponent size of (pSize / 2) but at least 384 bits
lSize
=
Math
.
max
(
384
,
pSize
>>
1
);
// if lSize is larger than pSize, limit by pSize
lSize
=
Math
.
min
(
lSize
,
pSize
);
if
(
lSize
<
384
)
{
lSize
=
384
;
}
}
BigInteger
x
;
...
...
src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
浏览文件 @
c6552bbb
/*
* Copyright (c) 1997, 201
1
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 201
2
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -67,10 +67,10 @@ extends AlgorithmParameterGeneratorSpi {
* @param random the source of randomness
*/
protected
void
engineInit
(
int
keysize
,
SecureRandom
random
)
{
if
((
keysize
<
512
)
||
(
keysize
>
1024
)
||
(
keysize
%
64
!=
0
))
{
if
((
keysize
<
512
)
||
(
keysize
>
2048
)
||
(
keysize
%
64
!=
0
))
{
throw
new
InvalidParameterException
(
"Keysize must be multiple "
+
"of 64, and can only range "
+
"from 512 to
1024
"
+
"from 512 to
2048
"
+
"(inclusive)"
);
}
this
.
primeSize
=
keysize
;
...
...
@@ -99,10 +99,10 @@ extends AlgorithmParameterGeneratorSpi {
DHGenParameterSpec
dhParamSpec
=
(
DHGenParameterSpec
)
genParamSpec
;
primeSize
=
dhParamSpec
.
getPrimeSize
();
if
((
primeSize
<
512
)
||
(
primeSize
>
1024
)
||
(
primeSize
%
64
!=
0
))
{
if
((
primeSize
<
512
)
||
(
primeSize
>
2048
)
||
(
primeSize
%
64
!=
0
))
{
throw
new
InvalidAlgorithmParameterException
(
"Modulus size must be multiple of 64, and can only range "
+
"from 512 to
1024
(inclusive)"
);
+
"from 512 to
2048
(inclusive)"
);
}
exponentSize
=
dhParamSpec
.
getExponentSize
();
...
...
src/share/classes/com/sun/crypto/provider/SunJCE.java
浏览文件 @
c6552bbb
...
...
@@ -167,17 +167,67 @@ public final class SunJCE extends Provider {
put
(
"Cipher.Blowfish SupportedPaddings"
,
BLOCK_PADS
);
put
(
"Cipher.Blowfish SupportedKeyFormats"
,
"RAW"
);
put
(
"Cipher.AES"
,
"com.sun.crypto.provider.AESCipher"
);
put
(
"Cipher.AES"
,
"com.sun.crypto.provider.AESCipher
$General
"
);
put
(
"Alg.Alias.Cipher.Rijndael"
,
"AES"
);
put
(
"Cipher.AES SupportedModes"
,
BLOCK_MODES128
);
put
(
"Cipher.AES SupportedPaddings"
,
BLOCK_PADS
);
put
(
"Cipher.AES SupportedKeyFormats"
,
"RAW"
);
put
(
"Cipher.AESWrap"
,
"com.sun.crypto.provider.AESWrapCipher"
);
put
(
"Cipher.AES_128/ECB/NoPadding"
,
"com.sun.crypto.provider.AESCipher$AES128_ECB_NoPadding"
);
put
(
"Alg.Alias.Cipher.2.16.840.1.101.3.4.1.1"
,
"AES_128/ECB/NoPadding"
);
put
(
"Alg.Alias.Cipher.OID.2.16.840.1.101.3.4.1.1"
,
"AES_128/ECB/NoPadding"
);
put
(
"Cipher.AES_128/CBC/NoPadding"
,
"com.sun.crypto.provider.AESCipher$AES128_CBC_NoPadding"
);
put
(
"Alg.Alias.Cipher.2.16.840.1.101.3.4.1.2"
,
"AES_128/CBC/NoPadding"
);
put
(
"Alg.Alias.Cipher.OID.2.16.840.1.101.3.4.1.2"
,
"AES_128/CBC/NoPadding"
);
put
(
"Cipher.AES_128/OFB/NoPadding"
,
"com.sun.crypto.provider.AESCipher$AES128_OFB_NoPadding"
);
put
(
"Alg.Alias.Cipher.2.16.840.1.101.3.4.1.3"
,
"AES_128/OFB/NoPadding"
);
put
(
"Alg.Alias.Cipher.OID.2.16.840.1.101.3.4.1.3"
,
"AES_128/OFB/NoPadding"
);
put
(
"Cipher.AES_128/CFB/NoPadding"
,
"com.sun.crypto.provider.AESCipher$AES128_CFB_NoPadding"
);
put
(
"Alg.Alias.Cipher.2.16.840.1.101.3.4.1.4"
,
"AES_128/CFB/NoPadding"
);
put
(
"Alg.Alias.Cipher.OID.2.16.840.1.101.3.4.1.4"
,
"AES_128/CFB/NoPadding"
);
put
(
"Cipher.AES_192/ECB/NoPadding"
,
"com.sun.crypto.provider.AESCipher$AES192_ECB_NoPadding"
);
put
(
"Alg.Alias.Cipher.2.16.840.1.101.3.4.1.21"
,
"AES_192/ECB/NoPadding"
);
put
(
"Alg.Alias.Cipher.OID.2.16.840.1.101.3.4.1.21"
,
"AES_192/ECB/NoPadding"
);
put
(
"Cipher.AES_192/CBC/NoPadding"
,
"com.sun.crypto.provider.AESCipher$AES192_CBC_NoPadding"
);
put
(
"Alg.Alias.Cipher.2.16.840.1.101.3.4.1.22"
,
"AES_192/CBC/NoPadding"
);
put
(
"Alg.Alias.Cipher.OID.2.16.840.1.101.3.4.1.22"
,
"AES_192/CBC/NoPadding"
);
put
(
"Cipher.AES_192/OFB/NoPadding"
,
"com.sun.crypto.provider.AESCipher$AES192_OFB_NoPadding"
);
put
(
"Alg.Alias.Cipher.2.16.840.1.101.3.4.1.23"
,
"AES_192/OFB/NoPadding"
);
put
(
"Alg.Alias.Cipher.OID.2.16.840.1.101.3.4.1.23"
,
"AES_192/OFB/NoPadding"
);
put
(
"Cipher.AES_192/CFB/NoPadding"
,
"com.sun.crypto.provider.AESCipher$AES192_CFB_NoPadding"
);
put
(
"Alg.Alias.Cipher.2.16.840.1.101.3.4.1.24"
,
"AES_192/CFB/NoPadding"
);
put
(
"Alg.Alias.Cipher.OID.2.16.840.1.101.3.4.1.24"
,
"AES_192/CFB/NoPadding"
);
put
(
"Cipher.AES_256/ECB/NoPadding"
,
"com.sun.crypto.provider.AESCipher$AES256_ECB_NoPadding"
);
put
(
"Alg.Alias.Cipher.2.16.840.1.101.3.4.1.41"
,
"AES_256/ECB/NoPadding"
);
put
(
"Alg.Alias.Cipher.OID.2.16.840.1.101.3.4.1.41"
,
"AES_256/ECB/NoPadding"
);
put
(
"Cipher.AES_256/CBC/NoPadding"
,
"com.sun.crypto.provider.AESCipher$AES256_CBC_NoPadding"
);
put
(
"Alg.Alias.Cipher.2.16.840.1.101.3.4.1.42"
,
"AES_256/CBC/NoPadding"
);
put
(
"Alg.Alias.Cipher.OID.2.16.840.1.101.3.4.1.42"
,
"AES_256/CBC/NoPadding"
);
put
(
"Cipher.AES_256/OFB/NoPadding"
,
"com.sun.crypto.provider.AESCipher$AES256_OFB_NoPadding"
);
put
(
"Alg.Alias.Cipher.2.16.840.1.101.3.4.1.43"
,
"AES_256/OFB/NoPadding"
);
put
(
"Alg.Alias.Cipher.OID.2.16.840.1.101.3.4.1.43"
,
"AES_256/OFB/NoPadding"
);
put
(
"Cipher.AES_256/CFB/NoPadding"
,
"com.sun.crypto.provider.AESCipher$AES256_CFB_NoPadding"
);
put
(
"Alg.Alias.Cipher.2.16.840.1.101.3.4.1.44"
,
"AES_256/CFB/NoPadding"
);
put
(
"Alg.Alias.Cipher.OID.2.16.840.1.101.3.4.1.44"
,
"AES_256/CFB/NoPadding"
);
put
(
"Cipher.AESWrap"
,
"com.sun.crypto.provider.AESWrapCipher$General"
);
put
(
"Cipher.AESWrap SupportedModes"
,
"ECB"
);
put
(
"Cipher.AESWrap SupportedPaddings"
,
"NOPADDING"
);
put
(
"Cipher.AESWrap SupportedKeyFormats"
,
"RAW"
);
put
(
"Cipher.AESWrap_128"
,
"com.sun.crypto.provider.AESWrapCipher$AES128"
);
put
(
"Alg.Alias.Cipher.2.16.840.1.101.3.4.1.5"
,
"AESWrap_128"
);
put
(
"Alg.Alias.Cipher.OID.2.16.840.1.101.3.4.1.5"
,
"AESWrap_128"
);
put
(
"Cipher.AESWrap_192"
,
"com.sun.crypto.provider.AESWrapCipher$AES192"
);
put
(
"Alg.Alias.Cipher.2.16.840.1.101.3.4.1.25"
,
"AESWrap_192"
);
put
(
"Alg.Alias.Cipher.OID.2.16.840.1.101.3.4.1.25"
,
"AESWrap_192"
);
put
(
"Cipher.AESWrap_256"
,
"com.sun.crypto.provider.AESWrapCipher$AES256"
);
put
(
"Alg.Alias.Cipher.2.16.840.1.101.3.4.1.45"
,
"AESWrap_256"
);
put
(
"Alg.Alias.Cipher.OID.2.16.840.1.101.3.4.1.45"
,
"AESWrap_256"
);
put
(
"Cipher.RC2"
,
"com.sun.crypto.provider.RC2Cipher"
);
put
(
"Cipher.RC2 SupportedModes"
,
BLOCK_MODES
);
...
...
@@ -192,7 +242,7 @@ public final class SunJCE extends Provider {
put
(
"Cipher.ARCFOUR SupportedKeyFormats"
,
"RAW"
);
/*
*
Key(pair) Generator engines
* Key(pair) Generator engines
*/
put
(
"KeyGenerator.DES"
,
"com.sun.crypto.provider.DESKeyGenerator"
);
...
...
@@ -221,6 +271,8 @@ public final class SunJCE extends Provider {
put
(
"KeyGenerator.HmacSHA1"
,
"com.sun.crypto.provider.HmacSHA1KeyGenerator"
);
put
(
"Alg.Alias.KeyGenerator.OID.1.2.840.113549.2.7"
,
"HmacSHA1"
);
put
(
"Alg.Alias.KeyGenerator.1.2.840.113549.2.7"
,
"HmacSHA1"
);
put
(
"KeyGenerator.HmacSHA224"
,
"com.sun.crypto.provider.KeyGeneratorCore$HmacSHA2KG$SHA224"
);
...
...
@@ -326,14 +378,12 @@ public final class SunJCE extends Provider {
"com.sun.crypto.provider.AESParameters"
);
put
(
"Alg.Alias.AlgorithmParameters.Rijndael"
,
"AES"
);
put
(
"AlgorithmParameters.RC2"
,
"com.sun.crypto.provider.RC2Parameters"
);
put
(
"AlgorithmParameters.OAEP"
,
"com.sun.crypto.provider.OAEPParameters"
);
/*
* Key factories
*/
...
...
@@ -403,6 +453,8 @@ public final class SunJCE extends Provider {
*/
put
(
"Mac.HmacMD5"
,
"com.sun.crypto.provider.HmacMD5"
);
put
(
"Mac.HmacSHA1"
,
"com.sun.crypto.provider.HmacSHA1"
);
put
(
"Alg.Alias.Mac.OID.1.2.840.113549.2.7"
,
"HmacSHA1"
);
put
(
"Alg.Alias.Mac.1.2.840.113549.2.7"
,
"HmacSHA1"
);
put
(
"Mac.HmacSHA224"
,
"com.sun.crypto.provider.HmacCore$HmacSHA224"
);
put
(
"Alg.Alias.Mac.OID.1.2.840.113549.2.8"
,
"HmacSHA224"
);
...
...
src/share/classes/java/io/ByteArrayOutputStream.java
浏览文件 @
c6552bbb
/*
* Copyright (c) 1994, 201
0
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1994, 201
2
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -210,21 +210,21 @@ public class ByteArrayOutputStream extends OutputStream {
/**
* Converts the buffer's contents into a string by decoding the bytes using
* the
specified {@link java.nio.charset.Charset charsetName}. The length of
*
the new <tt>String</tt> is a function of the charset, and hence may not be
*
equal
to the length of the byte array.
* the
named {@link java.nio.charset.Charset charset}. The length of the new
*
<tt>String</tt> is a function of the charset, and hence may not be equal
* to the length of the byte array.
*
* <p> This method always replaces malformed-input and unmappable-character
* sequences with this charset's default replacement string. The {@link
* java.nio.charset.CharsetDecoder} class should be used when more control
* over the decoding process is required.
*
* @param charsetName the name of a supported
*
{@linkplain java.nio.charset.Charset </code>charset<code>
}
* @return String decoded from the buffer's contents.
* @param
charsetName the name of a supported
*
{@link java.nio.charset.Charset charset
}
* @return
String decoded from the buffer's contents.
* @exception UnsupportedEncodingException
* If the named charset is not supported
* @since JDK1.1
* @since
JDK1.1
*/
public
synchronized
String
toString
(
String
charsetName
)
throws
UnsupportedEncodingException
...
...
src/share/classes/java/io/InputStreamReader.java
浏览文件 @
c6552bbb
/*
* Copyright (c) 1996, 20
05
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 20
12
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -86,7 +86,7 @@ public class InputStreamReader extends Reader {
*
* @param charsetName
* The name of a supported
* {@link java.nio.charset.Charset
</code>charset<code>
}
* {@link java.nio.charset.Charset
charset
}
*
* @exception UnsupportedEncodingException
* If the named charset is not supported
...
...
src/share/classes/java/lang/annotation/ContainerFor.java
0 → 100644
浏览文件 @
c6552bbb
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code 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
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package
java.lang.annotation
;
/**
* Indicates that an annotation type is a container for repeated
* instances of annotations of the type of the value of the
* {@code ContainerFor}'s value element.
*
* @since 1.8
* @jls 9.6 Annotation Types
* @jls 9.7 Annotations
*/
@Documented
@Retention
(
RetentionPolicy
.
RUNTIME
)
@Target
(
ElementType
.
ANNOTATION_TYPE
)
public
@interface
ContainerFor
{
/**
* The repeating annotation type that the annotation type
* annotated with this annotation is a container for.
*/
Class
<?
extends
Annotation
>
value
();
}
src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java
浏览文件 @
c6552bbb
/*
* Copyright (c) 1997, 20
05
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 20
12
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -62,6 +62,9 @@ import java.security.*;
* interface is all that is needed when you accept defaults for algorithm-specific
* parameters.
*
* <p>Note: Some earlier implementations of this interface may not support
* larger sizes of DSA parameters such as 2048 and 3072-bit.
*
* @see java.security.KeyPairGenerator
*/
public
interface
DSAKeyPairGenerator
{
...
...
@@ -78,7 +81,7 @@ public interface DSAKeyPairGenerator {
* can be null.
*
* @exception InvalidParameterException if the <code>params</code>
* value is invalid
or null
.
* value is invalid
, null, or unsupported
.
*/
public
void
initialize
(
DSAParams
params
,
SecureRandom
random
)
throws
InvalidParameterException
;
...
...
@@ -97,7 +100,7 @@ public interface DSAKeyPairGenerator {
* default parameters for modulus lengths of 512 and 1024 bits.
*
* @param modlen the modulus length in bits. Valid values are any
* multiple of
8 between 512 and 1024, inclusive
.
* multiple of
64 between 512 and 1024, inclusive, 2048, and 3072
.
*
* @param random the random bit source to use to generate key bits;
* can be null.
...
...
@@ -105,10 +108,9 @@ public interface DSAKeyPairGenerator {
* @param genParams whether or not to generate new parameters for
* the modulus length requested.
*
* @exception InvalidParameterException if <code>modlen</code> is not
* between 512 and 1024, or if <code>genParams</code> is false and
* there are no precomputed parameters for the requested modulus
* length.
* @exception InvalidParameterException if <code>modlen</code> is
* invalid, or unsupported, or if <code>genParams</code> is false and there
* are no precomputed parameters for the requested modulus length.
*/
public
void
initialize
(
int
modlen
,
boolean
genParams
,
SecureRandom
random
)
throws
InvalidParameterException
;
...
...
src/share/classes/java/security/spec/DSAGenParameterSpec.java
0 → 100644
浏览文件 @
c6552bbb
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code 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
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package
java.security.spec
;
/**
* This immutable class specifies the set of parameters used for
* generating DSA parameters as specified in
* <a href="http://csrc.nist.gov/publications/fips/fips186-3/fips_186-3.pdf">FIPS 186-3 Digital Signature Standard (DSS)</a>.
*
* @see AlgorithmParameterSpec
*
* @since 8
*/
public
final
class
DSAGenParameterSpec
implements
AlgorithmParameterSpec
{
private
final
int
pLen
;
private
final
int
qLen
;
private
final
int
seedLen
;
/**
* Creates a domain parameter specification for DSA parameter
* generation using <code>primePLen</code> and <code>subprimeQLen</code>.
* The value of <code>subprimeQLen</code> is also used as the default
* length of the domain parameter seed in bits.
* @param primePLen the desired length of the prime P in bits.
* @param subprimeQLen the desired length of the sub-prime Q in bits.
* @exception IllegalArgumentException if <code>primePLen</code>
* or <code>subprimeQLen</code> is illegal per the specification of
* FIPS 186-3.
*/
public
DSAGenParameterSpec
(
int
primePLen
,
int
subprimeQLen
)
{
this
(
primePLen
,
subprimeQLen
,
subprimeQLen
);
}
/**
* Creates a domain parameter specification for DSA parameter
* generation using <code>primePLen</code>, <code>subprimeQLen</code>,
* and <code>seedLen</code>.
* @param primePLen the desired length of the prime P in bits.
* @param subprimeQLen the desired length of the sub-prime Q in bits.
* @param seedLen the desired length of the domain parameter seed in bits,
* shall be equal to or greater than <code>subprimeQLen</code>.
* @exception IllegalArgumentException if <code>primePLenLen</code>,
* <code>subprimeQLen</code>, or <code>seedLen</code> is illegal per the
* specification of FIPS 186-3.
*/
public
DSAGenParameterSpec
(
int
primePLen
,
int
subprimeQLen
,
int
seedLen
)
{
switch
(
primePLen
)
{
case
1024
:
if
(
subprimeQLen
!=
160
)
{
throw
new
IllegalArgumentException
(
"subprimeQLen must be 160 when primePLen=1024"
);
}
break
;
case
2048
:
if
(
subprimeQLen
!=
224
&&
subprimeQLen
!=
256
)
{
throw
new
IllegalArgumentException
(
"subprimeQLen must be 224 or 256 when primePLen=2048"
);
}
break
;
case
3072
:
if
(
subprimeQLen
!=
256
)
{
throw
new
IllegalArgumentException
(
"subprimeQLen must be 256 when primePLen=3072"
);
}
break
;
default
:
throw
new
IllegalArgumentException
(
"primePLen must be 1024, 2048, or 3072"
);
}
if
(
seedLen
<
subprimeQLen
)
{
throw
new
IllegalArgumentException
(
"seedLen must be equal to or greater than subprimeQLen"
);
}
this
.
pLen
=
primePLen
;
this
.
qLen
=
subprimeQLen
;
this
.
seedLen
=
seedLen
;
}
/**
* Returns the desired length of the prime P of the
* to-be-generated DSA domain parameters in bits.
* @return the length of the prime P.
*/
public
int
getPrimePLength
()
{
return
pLen
;
}
/**
* Returns the desired length of the sub-prime Q of the
* to-be-generated DSA domain parameters in bits.
* @return the length of the sub-prime Q.
*/
public
int
getSubprimeQLength
()
{
return
qLen
;
}
/**
* Returns the desired length of the domain parameter seed in bits.
* @return the length of the domain parameter seed.
*/
public
int
getSeedLength
()
{
return
seedLen
;
}
}
src/share/classes/java/sql/DriverManager.java
浏览文件 @
c6552bbb
...
...
@@ -510,7 +510,7 @@ public class DriverManager {
public
Void
run
()
{
ServiceLoader
<
Driver
>
loadedDrivers
=
ServiceLoader
.
load
(
Driver
.
class
);
Iterator
driversIterator
=
loadedDrivers
.
iterator
();
Iterator
<
Driver
>
driversIterator
=
loadedDrivers
.
iterator
();
/* Load these drivers, so that they can be instantiated.
* It may be the case that the driver class may not be there
...
...
src/share/classes/sun/security/ec/ECKeyFactory.java
浏览文件 @
c6552bbb
/*
* Copyright (c) 2006, 201
1
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 201
2
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -51,33 +51,21 @@ import java.security.spec.*;
*/
public
final
class
ECKeyFactory
extends
KeyFactorySpi
{
// Used by translateKey()
and the SunPKCS11 provider
p
ublic
final
static
KeyFactory
INSTANCE
;
// Used by translateKey()
p
rivate
static
KeyFactory
instance
;
// Internal provider object we can obtain the KeyFactory and
// AlgorithmParameters from. Used by ECParameters and AlgorithmId.
// This can go away once we have EC always available in the SUN provider.
// Used by ECParameters and AlgorithmId.
public
final
static
Provider
ecInternalProvider
;
static
{
final
Provider
p
=
new
Provider
(
"SunEC-Internal"
,
1.0d
,
null
)
{
private
static
final
long
serialVersionUID
=
970685700309471261L
;
};
AccessController
.
doPrivileged
(
new
PrivilegedAction
<
Void
>()
{
public
Void
run
()
{
p
.
put
(
"KeyFactory.EC"
,
"sun.security.ec.ECKeyFactory"
);
p
.
put
(
"AlgorithmParameters.EC"
,
"sun.security.ec.ECParameters"
);
p
.
put
(
"Alg.Alias.AlgorithmParameters.1.2.840.10045.2.1"
,
"EC"
);
return
null
;
private
static
KeyFactory
getInstance
()
{
if
(
instance
==
null
)
{
try
{
instance
=
KeyFactory
.
getInstance
(
"EC"
,
"SunEC"
);
}
catch
(
NoSuchProviderException
e
)
{
throw
new
RuntimeException
(
e
);
}
catch
(
NoSuchAlgorithmException
e
)
{
throw
new
RuntimeException
(
e
);
}
});
try
{
INSTANCE
=
KeyFactory
.
getInstance
(
"EC"
,
p
);
}
catch
(
NoSuchAlgorithmException
e
)
{
throw
new
RuntimeException
(
e
);
}
ecInternalProvider
=
p
;
return
instance
;
}
public
ECKeyFactory
()
{
...
...
@@ -102,7 +90,12 @@ public final class ECKeyFactory extends KeyFactorySpi {
checkKey
(
ecKey
);
return
ecKey
;
}
else
{
return
(
ECKey
)
INSTANCE
.
translateKey
(
key
);
/*
* We don't call the engineTranslateKey method directly
* because KeyFactory.translateKey adds code to loop through
* all key factories.
*/
return
(
ECKey
)
getInstance
().
translateKey
(
key
);
}
}
...
...
src/share/classes/sun/security/ec/ECParameters.java
浏览文件 @
c6552bbb
/*
* Copyright (c) 2006, 201
1
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 201
2
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -276,8 +276,8 @@ public final class ECParameters extends AlgorithmParametersSpi {
static
AlgorithmParameters
getAlgorithmParameters
(
ECParameterSpec
spec
)
throws
InvalidKeyException
{
try
{
AlgorithmParameters
params
=
AlgorithmParameters
.
getInstance
(
"EC"
,
ECKeyFactory
.
ecInternalProvider
);
AlgorithmParameters
params
=
AlgorithmParameters
.
getInstance
(
"EC"
,
"SunEC"
);
params
.
init
(
spec
);
return
params
;
}
catch
(
GeneralSecurityException
e
)
{
...
...
src/share/classes/sun/security/ec/ECPublicKeyImpl.java
浏览文件 @
c6552bbb
...
...
@@ -96,8 +96,13 @@ public final class ECPublicKeyImpl extends X509Key implements ECPublicKey {
*/
@SuppressWarnings
(
"deprecation"
)
protected
void
parseKeyBits
()
throws
InvalidKeyException
{
AlgorithmParameters
algParams
=
this
.
algid
.
getParameters
();
if
(
algParams
==
null
)
{
throw
new
InvalidKeyException
(
"EC domain parameters must be "
+
"encoded in the algorithm identifier"
);
}
try
{
AlgorithmParameters
algParams
=
this
.
algid
.
getParameters
();
params
=
algParams
.
getParameterSpec
(
ECParameterSpec
.
class
);
w
=
ECParameters
.
decodePoint
(
key
,
params
.
getCurve
());
}
catch
(
IOException
e
)
{
...
...
src/share/classes/sun/security/ec/SunECEntries.java
浏览文件 @
c6552bbb
...
...
@@ -54,6 +54,7 @@ final class SunECEntries {
*/
map
.
put
(
"AlgorithmParameters.EC"
,
"sun.security.ec.ECParameters"
);
map
.
put
(
"Alg.Alias.AlgorithmParameters.EllipticCurve"
,
"EC"
);
map
.
put
(
"Alg.Alias.AlgorithmParameters.1.2.840.10045.2.1"
,
"EC"
);
map
.
put
(
"AlgorithmParameters.EC KeySize"
,
"256"
);
...
...
@@ -133,6 +134,9 @@ final class SunECEntries {
"sun.security.ec.ECDSASignature$Raw"
);
map
.
put
(
"Signature.SHA1withECDSA"
,
"sun.security.ec.ECDSASignature$SHA1"
);
map
.
put
(
"Alg.Alias.Signature.OID.1.2.840.10045.4.1"
,
"SHA1withECDSA"
);
map
.
put
(
"Alg.Alias.Signature.1.2.840.10045.4.1"
,
"SHA1withECDSA"
);
map
.
put
(
"Signature.SHA224withECDSA"
,
"sun.security.ec.ECDSASignature$SHA224"
);
map
.
put
(
"Alg.Alias.Signature.OID.1.2.840.10045.4.3.1"
,
"SHA224withECDSA"
);
...
...
src/share/classes/sun/security/krb5/Config.java
浏览文件 @
c6552bbb
...
...
@@ -115,7 +115,12 @@ public class Config {
private
static
boolean
isMacosLionOrBetter
()
{
// split the "10.x.y" version number
String
osVersion
=
System
.
getProperty
(
"os.version"
);
String
osname
=
getProperty
(
"os.name"
);
if
(!
osname
.
contains
(
"OS X"
))
{
return
false
;
}
String
osVersion
=
getProperty
(
"os.version"
);
String
[]
fragments
=
osVersion
.
split
(
"\\."
);
// sanity check the "10." part of the version
...
...
@@ -140,20 +145,14 @@ public class Config {
/*
* If either one system property is specified, we throw exception.
*/
String
tmp
=
java
.
security
.
AccessController
.
doPrivileged
(
new
sun
.
security
.
action
.
GetPropertyAction
(
"java.security.krb5.kdc"
));
String
tmp
=
getProperty
(
"java.security.krb5.kdc"
);
if
(
tmp
!=
null
)
{
// The user can specify a list of kdc hosts separated by ":"
defaultKDC
=
tmp
.
replace
(
':'
,
' '
);
}
else
{
defaultKDC
=
null
;
}
defaultRealm
=
java
.
security
.
AccessController
.
doPrivileged
(
new
sun
.
security
.
action
.
GetPropertyAction
(
"java.security.krb5.realm"
));
defaultRealm
=
getProperty
(
"java.security.krb5.realm"
);
if
((
defaultKDC
==
null
&&
defaultRealm
!=
null
)
||
(
defaultRealm
==
null
&&
defaultKDC
!=
null
))
{
throw
new
KrbException
...
...
@@ -165,11 +164,34 @@ public class Config {
// Always read the Kerberos configuration file
try
{
Vector
<
String
>
configFile
;
configFile
=
loadConfigFile
();
if
(
configFile
==
null
&&
isMacosLionOrBetter
())
{
stanzaTable
=
SCDynamicStoreConfig
.
getConfig
();
}
else
{
String
fileName
=
getJavaFileName
();
if
(
fileName
!=
null
)
{
configFile
=
loadConfigFile
(
fileName
);
stanzaTable
=
parseStanzaTable
(
configFile
);
if
(
DEBUG
)
{
System
.
out
.
println
(
"Loaded from Java config"
);
}
}
else
{
boolean
found
=
false
;
if
(
isMacosLionOrBetter
())
{
try
{
stanzaTable
=
SCDynamicStoreConfig
.
getConfig
();
if
(
DEBUG
)
{
System
.
out
.
println
(
"Loaded from SCDynamicStoreConfig"
);
}
found
=
true
;
}
catch
(
IOException
ioe
)
{
// OK. Will go on with file
}
}
if
(!
found
)
{
fileName
=
getNativeFileName
();
configFile
=
loadConfigFile
(
fileName
);
stanzaTable
=
parseStanzaTable
(
configFile
);
if
(
DEBUG
)
{
System
.
out
.
println
(
"Loaded from native config"
);
}
}
}
}
catch
(
IOException
ioe
)
{
// No krb5.conf, no problem. We'll use DNS or system property etc.
...
...
@@ -546,10 +568,13 @@ public class Config {
* [domain_realm]
* blue.sample.com = TEST.SAMPLE.COM
* .backup.com = EXAMPLE.COM
*
* @params fileName the conf file, cannot be null
* @return the content, null if fileName is empty
* @throws IOException if there is an I/O or format error
*/
private
Vector
<
String
>
loadConfigFile
()
throws
IOException
{
private
Vector
<
String
>
loadConfigFile
(
final
String
fileName
)
throws
IOException
{
try
{
final
String
fileName
=
getFileName
();
if
(!
fileName
.
equals
(
""
))
{
BufferedReader
br
=
new
BufferedReader
(
new
InputStreamReader
(
java
.
security
.
AccessController
.
doPrivileged
(
...
...
@@ -668,97 +693,106 @@ public class Config {
}
/**
* Gets the default configuration file name. This method will never
* return null.
* Gets the default Java configuration file name.
*
* If the system property "java.security.krb5.conf" is defined, we'll
* use its value, no matter if the file exists or not. Otherwise,
* the file will be searched in a list of possible loations in the
* following order:
* use its value, no matter if the file exists or not. Otherwise, we
* will look at $JAVA_HOME/lib/security directory with "krb5.conf" name,
* and return it if the file exists.
*
* The method returns null if it cannot find a Java config file.
*/
private
String
getJavaFileName
()
{
String
name
=
getProperty
(
"java.security.krb5.conf"
);
if
(
name
==
null
)
{
name
=
getProperty
(
"java.home"
)
+
File
.
separator
+
"lib"
+
File
.
separator
+
"security"
+
File
.
separator
+
"krb5.conf"
;
if
(!
fileExists
(
name
))
{
name
=
null
;
}
}
if
(
DEBUG
)
{
System
.
out
.
println
(
"Java config name: "
+
name
);
}
return
name
;
}
/**
* Gets the default native configuration file name.
*
* 1. at Java home lib\security directory with "krb5.conf" name,
* 2. at windows directory with the name of "krb5.ini" for Windows,
* /etc/krb5/krb5.conf for Solaris, /etc/krb5.conf otherwise.
* Depending on the OS type, the method returns the default native
* kerberos config file name, which is at windows directory with
* the name of "krb5.ini" for Windows, /etc/krb5/krb5.conf for Solaris,
* /etc/krb5.conf otherwise. Mac OSX X has a different file name.
*
* Note: When the Terminal Service is started in Windows (from 2003),
* there are two kinds of Windows directories: A system one (say,
* C:\Windows), and a user-private one (say, C:\Users\Me\Windows).
* We will first look for krb5.ini in the user-private one. If not
* found, try the system one instead.
*
* This method will always return a non-null non-empty file name,
* even if that file does not exist.
*/
private
String
getFileName
()
{
String
name
=
java
.
security
.
AccessController
.
doPrivileged
(
new
sun
.
security
.
action
.
GetPropertyAction
(
"java.security.krb5.conf"
));
if
(
name
==
null
)
{
name
=
java
.
security
.
AccessController
.
doPrivileged
(
new
sun
.
security
.
action
.
GetPropertyAction
(
"java.home"
))
+
File
.
separator
+
"lib"
+
File
.
separator
+
"security"
+
File
.
separator
+
"krb5.conf"
;
if
(!
fileExists
(
name
))
{
name
=
null
;
String
osname
=
java
.
security
.
AccessController
.
doPrivileged
(
new
sun
.
security
.
action
.
GetPropertyAction
(
"os.name"
));
if
(
osname
.
startsWith
(
"Windows"
))
{
try
{
Credentials
.
ensureLoaded
();
}
catch
(
Exception
e
)
{
// ignore exceptions
private
String
getNativeFileName
()
{
String
name
=
null
;
String
osname
=
getProperty
(
"os.name"
);
if
(
osname
.
startsWith
(
"Windows"
))
{
try
{
Credentials
.
ensureLoaded
();
}
catch
(
Exception
e
)
{
// ignore exceptions
}
if
(
Credentials
.
alreadyLoaded
)
{
String
path
=
getWindowsDirectory
(
false
);
if
(
path
!=
null
)
{
if
(
path
.
endsWith
(
"\\"
))
{
path
=
path
+
"krb5.ini"
;
}
else
{
path
=
path
+
"\\krb5.ini"
;
}
if
(
Credentials
.
alreadyLoaded
)
{
String
path
=
getWindowsDirectory
(
false
);
if
(
path
!=
null
)
{
if
(
path
.
endsWith
(
"\\"
))
{
path
=
path
+
"krb5.ini"
;
}
else
{
path
=
path
+
"\\krb5.ini"
;
}
if
(
fileExists
(
path
))
{
name
=
path
;
}
}
if
(
name
==
null
)
{
path
=
getWindowsDirectory
(
true
);
if
(
path
!=
null
)
{
if
(
path
.
endsWith
(
"\\"
))
{
path
=
path
+
"krb5.ini"
;
}
else
{
path
=
path
+
"\\krb5.ini"
;
}
name
=
path
;
}
}
if
(
fileExists
(
path
))
{
name
=
path
;
}
if
(
name
==
null
)
{
name
=
"c:\\winnt\\krb5.ini"
;
}
if
(
name
==
null
)
{
path
=
getWindowsDirectory
(
true
);
if
(
path
!=
null
)
{
if
(
path
.
endsWith
(
"\\"
))
{
path
=
path
+
"krb5.ini"
;
}
else
{
path
=
path
+
"\\krb5.ini"
;
}
name
=
path
;
}
}
else
if
(
osname
.
startsWith
(
"SunOS"
))
{
name
=
"/etc/krb5/krb5.conf"
;
}
else
if
(
osname
.
contains
(
"OS X"
))
{
if
(
isMacosLionOrBetter
())
return
""
;
name
=
findMacosConfigFile
();
}
else
{
name
=
"/etc/krb5.conf"
;
}
}
if
(
name
==
null
)
{
name
=
"c:\\winnt\\krb5.ini"
;
}
}
else
if
(
osname
.
startsWith
(
"SunOS"
))
{
name
=
"/etc/krb5/krb5.conf"
;
}
else
if
(
osname
.
contains
(
"OS X"
))
{
name
=
findMacosConfigFile
();
}
else
{
name
=
"/etc/krb5.conf"
;
}
if
(
DEBUG
)
{
System
.
out
.
println
(
"
C
onfig name: "
+
name
);
System
.
out
.
println
(
"
Native c
onfig name: "
+
name
);
}
return
name
;
}
private
String
getProperty
(
String
property
)
{
return
java
.
security
.
AccessController
.
doPrivileged
(
new
sun
.
security
.
action
.
GetPropertyAction
(
property
));
private
static
String
getProperty
(
String
property
)
{
return
java
.
security
.
AccessController
.
doPrivileged
(
new
sun
.
security
.
action
.
GetPropertyAction
(
property
));
}
private
String
findMacosConfigFile
()
{
String
userHome
=
getProperty
(
"user.home"
);
final
String
PREF_FILE
=
"/Library/Preferences/edu.mit.Kerberos"
;
String
userPrefs
=
userHome
+
PREF_FILE
;
String
userPrefs
=
userHome
+
PREF_FILE
;
if
(
fileExists
(
userPrefs
))
{
return
userPrefs
;
...
...
@@ -768,11 +802,7 @@ public class Config {
return
PREF_FILE
;
}
if
(
fileExists
(
"/etc/krb5.conf"
))
{
return
"/etc/krb5.conf"
;
}
return
""
;
return
"/etc/krb5.conf"
;
}
private
static
String
trimmed
(
String
s
)
{
...
...
@@ -1344,32 +1374,52 @@ public class Config {
}
}
// Shows the content of the Config object for debug purpose.
//
// {
// libdefaults = {
// default_realm = R
// }
// realms = {
// R = {
// kdc = [k1,k2]
// }
// }
// }
@Override
public
String
toString
()
{
StringBuffer
sb
=
new
StringBuffer
();
toStringIn
dented
(
""
,
stanzaTable
,
sb
);
toStringIn
ternal
(
""
,
stanzaTable
,
sb
);
return
sb
.
toString
();
}
private
static
void
toStringIn
dented
(
String
prefix
,
Object
obj
,
private
static
void
toStringIn
ternal
(
String
prefix
,
Object
obj
,
StringBuffer
sb
)
{
if
(
obj
instanceof
String
)
{
sb
.
append
(
prefix
);
sb
.
append
(
obj
);
sb
.
append
(
'\n'
);
// A string value, just print it
sb
.
append
(
obj
).
append
(
'\n'
);
}
else
if
(
obj
instanceof
Hashtable
)
{
// A table, start a new sub-section...
Hashtable
<?,
?>
tab
=
(
Hashtable
<?,
?>)
obj
;
sb
.
append
(
"{\n"
);
for
(
Object
o:
tab
.
keySet
())
{
sb
.
append
(
prefix
);
sb
.
append
(
o
);
sb
.
append
(
" = {\n"
);
toStringIndented
(
prefix
+
" "
,
tab
.
get
(
o
),
sb
);
sb
.
append
(
prefix
+
"}\n"
);
// ...indent, print "key = ", and
sb
.
append
(
prefix
).
append
(
" "
).
append
(
o
).
append
(
" = "
);
// ...go recursively into value
toStringInternal
(
prefix
+
" "
,
tab
.
get
(
o
),
sb
);
}
sb
.
append
(
prefix
).
append
(
"}\n"
);
}
else
if
(
obj
instanceof
Vector
)
{
// A vector of strings, print them inside [ and ]
Vector
<?>
v
=
(
Vector
<?>)
obj
;
sb
.
append
(
"["
);
boolean
first
=
true
;
for
(
Object
o:
v
.
toArray
())
{
toStringIndented
(
prefix
+
" "
,
o
,
sb
);
if
(!
first
)
sb
.
append
(
","
);
sb
.
append
(
o
);
first
=
false
;
}
sb
.
append
(
"]\n"
);
}
}
}
src/share/classes/sun/security/pkcs11/P11Cipher.java
浏览文件 @
c6552bbb
...
...
@@ -164,6 +164,10 @@ final class P11Cipher extends CipherSpi {
// if we do the padding
private
int
bytesBuffered
;
// length of key size in bytes; currently only used by AES given its oid
// specification mandates a fixed size of the key
private
int
fixedKeySize
=
-
1
;
P11Cipher
(
Token
token
,
String
algorithm
,
long
mechanism
)
throws
PKCS11Exception
,
NoSuchAlgorithmException
{
super
();
...
...
@@ -172,19 +176,26 @@ final class P11Cipher extends CipherSpi {
this
.
mechanism
=
mechanism
;
String
algoParts
[]
=
algorithm
.
split
(
"/"
);
keyAlgorithm
=
algoParts
[
0
];
if
(
keyAlgorithm
.
equals
(
"AES"
))
{
if
(
algoParts
[
0
].
startsWith
(
"AES"
))
{
blockSize
=
16
;
}
else
if
(
keyAlgorithm
.
equals
(
"RC4"
)
||
keyAlgorithm
.
equals
(
"ARCFOUR"
))
{
blockSize
=
0
;
}
else
{
// DES, DESede, Blowfish
blockSize
=
8
;
}
this
.
blockMode
=
int
index
=
algoParts
[
0
].
indexOf
(
'_'
);
if
(
index
!=
-
1
)
{
// should be well-formed since we specify what we support
fixedKeySize
=
Integer
.
parseInt
(
algoParts
[
0
].
substring
(
index
+
1
))/
8
;
}
keyAlgorithm
=
"AES"
;
}
else
{
keyAlgorithm
=
algoParts
[
0
];
if
(
keyAlgorithm
.
equals
(
"RC4"
)
||
keyAlgorithm
.
equals
(
"ARCFOUR"
))
{
blockSize
=
0
;
}
else
{
// DES, DESede, Blowfish
blockSize
=
8
;
}
this
.
blockMode
=
(
algoParts
.
length
>
1
?
parseMode
(
algoParts
[
1
])
:
MODE_ECB
);
}
String
defPadding
=
(
blockSize
==
0
?
"NoPadding"
:
"PKCS5Padding"
);
String
paddingStr
=
(
algoParts
.
length
>
2
?
algoParts
[
2
]
:
defPadding
);
...
...
@@ -333,6 +344,9 @@ final class P11Cipher extends CipherSpi {
SecureRandom
random
)
throws
InvalidKeyException
,
InvalidAlgorithmParameterException
{
cancelOperation
();
if
(
fixedKeySize
!=
-
1
&&
key
.
getEncoded
().
length
!=
fixedKeySize
)
{
throw
new
InvalidKeyException
(
"Key size is invalid"
);
}
switch
(
opmode
)
{
case
Cipher
.
ENCRYPT_MODE
:
encrypt
=
true
;
...
...
src/share/classes/sun/security/pkcs11/P11ECKeyFactory.java
浏览文件 @
c6552bbb
/*
* Copyright (c) 2006, 201
1
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 201
2
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -304,7 +304,7 @@ final class P11ECKeyFactory extends P11KeyFactory {
}
KeyFactory
implGetSoftwareFactory
()
throws
GeneralSecurityException
{
return
sun
.
security
.
ec
.
ECKeyFactory
.
INSTANCE
;
return
KeyFactory
.
getInstance
(
"EC"
,
"SunEC"
)
;
}
}
src/share/classes/sun/security/pkcs11/SunPKCS11.java
浏览文件 @
c6552bbb
...
...
@@ -399,12 +399,8 @@ public final class SunPKCS11 extends AuthProvider {
return
System
.
identityHashCode
(
this
);
}
private
static
String
[]
s
(
String
s1
)
{
return
new
String
[]
{
s1
};
}
private
static
String
[]
s
(
String
s1
,
String
s2
)
{
return
new
String
[]
{
s1
,
s2
};
private
static
String
[]
s
(
String
...
aliases
)
{
return
aliases
;
}
private
static
final
class
Descriptor
{
...
...
@@ -521,7 +517,8 @@ public final class SunPKCS11 extends AuthProvider {
m
(
CKM_MD2
));
d
(
MD
,
"MD5"
,
P11Digest
,
m
(
CKM_MD5
));
d
(
MD
,
"SHA1"
,
P11Digest
,
s
(
"SHA"
,
"SHA-1"
),
d
(
MD
,
"SHA1"
,
P11Digest
,
s
(
"SHA"
,
"SHA-1"
,
"1.3.14.3.2.26"
,
"OID.1.3.14.3.2.26"
),
m
(
CKM_SHA_1
));
d
(
MD
,
"SHA-224"
,
P11Digest
,
...
...
@@ -540,6 +537,7 @@ public final class SunPKCS11 extends AuthProvider {
d
(
MAC
,
"HmacMD5"
,
P11MAC
,
m
(
CKM_MD5_HMAC
));
d
(
MAC
,
"HmacSHA1"
,
P11MAC
,
s
(
"1.2.840.113549.2.7"
,
"OID.1.2.840.113549.2.7"
),
m
(
CKM_SHA_1_HMAC
));
d
(
MAC
,
"HmacSHA224"
,
P11MAC
,
s
(
"1.2.840.113549.2.8"
,
"OID.1.2.840.113549.2.8"
),
...
...
@@ -561,6 +559,7 @@ public final class SunPKCS11 extends AuthProvider {
d
(
KPG
,
"RSA"
,
P11KeyPairGenerator
,
m
(
CKM_RSA_PKCS_KEY_PAIR_GEN
));
d
(
KPG
,
"DSA"
,
P11KeyPairGenerator
,
s
(
"1.3.14.3.2.12"
,
"1.2.840.10040.4.1"
,
"OID.1.2.840.10040.4.1"
),
m
(
CKM_DSA_KEY_PAIR_GEN
));
d
(
KPG
,
"DH"
,
P11KeyPairGenerator
,
s
(
"DiffieHellman"
),
m
(
CKM_DH_PKCS_KEY_PAIR_GEN
));
...
...
@@ -583,6 +582,7 @@ public final class SunPKCS11 extends AuthProvider {
d
(
KF
,
"RSA"
,
P11RSAKeyFactory
,
m
(
CKM_RSA_PKCS_KEY_PAIR_GEN
,
CKM_RSA_PKCS
,
CKM_RSA_X_509
));
d
(
KF
,
"DSA"
,
P11DSAKeyFactory
,
s
(
"1.3.14.3.2.12"
,
"1.2.840.10040.4.1"
,
"OID.1.2.840.10040.4.1"
),
m
(
CKM_DSA_KEY_PAIR_GEN
,
CKM_DSA
,
CKM_DSA_SHA1
));
d
(
KF
,
"DH"
,
P11DHKeyFactory
,
s
(
"DiffieHellman"
),
m
(
CKM_DH_PKCS_KEY_PAIR_GEN
,
CKM_DH_PKCS_DERIVE
));
...
...
@@ -609,6 +609,7 @@ public final class SunPKCS11 extends AuthProvider {
d
(
SKF
,
"DESede"
,
P11SecretKeyFactory
,
m
(
CKM_DES3_CBC
));
d
(
SKF
,
"AES"
,
P11SecretKeyFactory
,
s
(
"2.16.840.1.101.3.4.1"
,
"OID.2.16.840.1.101.3.4.1"
),
m
(
CKM_AES_CBC
));
d
(
SKF
,
"Blowfish"
,
P11SecretKeyFactory
,
m
(
CKM_BLOWFISH_CBC
));
...
...
@@ -635,10 +636,28 @@ public final class SunPKCS11 extends AuthProvider {
m
(
CKM_DES3_ECB
));
d
(
CIP
,
"AES/CBC/NoPadding"
,
P11Cipher
,
m
(
CKM_AES_CBC
));
d
(
CIP
,
"AES_128/CBC/NoPadding"
,
P11Cipher
,
s
(
"2.16.840.1.101.3.4.1.2"
,
"OID.2.16.840.1.101.3.4.1.2"
),
m
(
CKM_AES_CBC
));
d
(
CIP
,
"AES_192/CBC/NoPadding"
,
P11Cipher
,
s
(
"2.16.840.1.101.3.4.1.22"
,
"OID.2.16.840.1.101.3.4.1.22"
),
m
(
CKM_AES_CBC
));
d
(
CIP
,
"AES_256/CBC/NoPadding"
,
P11Cipher
,
s
(
"2.16.840.1.101.3.4.1.42"
,
"OID.2.16.840.1.101.3.4.1.42"
),
m
(
CKM_AES_CBC
));
d
(
CIP
,
"AES/CBC/PKCS5Padding"
,
P11Cipher
,
m
(
CKM_AES_CBC_PAD
,
CKM_AES_CBC
));
d
(
CIP
,
"AES/ECB/NoPadding"
,
P11Cipher
,
m
(
CKM_AES_ECB
));
d
(
CIP
,
"AES_128/ECB/NoPadding"
,
P11Cipher
,
s
(
"2.16.840.1.101.3.4.1.1"
,
"OID.2.16.840.1.101.3.4.1.1"
),
m
(
CKM_AES_ECB
));
d
(
CIP
,
"AES_192/ECB/NoPadding"
,
P11Cipher
,
s
(
"2.16.840.1.101.3.4.1.21"
,
"OID.2.16.840.1.101.3.4.1.21"
),
m
(
CKM_AES_ECB
));
d
(
CIP
,
"AES_256/ECB/NoPadding"
,
P11Cipher
,
s
(
"2.16.840.1.101.3.4.1.41"
,
"OID.2.16.840.1.101.3.4.1.41"
),
m
(
CKM_AES_ECB
));
d
(
CIP
,
"AES/ECB/PKCS5Padding"
,
P11Cipher
,
s
(
"AES"
),
m
(
CKM_AES_ECB
));
d
(
CIP
,
"AES/CTR/NoPadding"
,
P11Cipher
,
...
...
@@ -654,13 +673,16 @@ public final class SunPKCS11 extends AuthProvider {
d
(
CIP
,
"RSA/ECB/NoPadding"
,
P11RSACipher
,
m
(
CKM_RSA_X_509
));
d
(
SIG
,
"RawDSA"
,
P11Signature
,
s
(
"NONEwithDSA"
),
d
(
SIG
,
"RawDSA"
,
P11Signature
,
s
(
"NONEwithDSA"
),
m
(
CKM_DSA
));
d
(
SIG
,
"DSA"
,
P11Signature
,
s
(
"SHA1withDSA"
),
d
(
SIG
,
"DSA"
,
P11Signature
,
s
(
"SHA1withDSA"
,
"1.3.14.3.2.13"
,
"1.3.14.3.2.27"
,
"1.2.840.10040.4.3"
,
"OID.1.2.840.10040.4.3"
),
m
(
CKM_DSA_SHA1
,
CKM_DSA
));
d
(
SIG
,
"NONEwithECDSA"
,
P11Signature
,
m
(
CKM_ECDSA
));
d
(
SIG
,
"SHA1withECDSA"
,
P11Signature
,
s
(
"ECDSA"
),
d
(
SIG
,
"SHA1withECDSA"
,
P11Signature
,
s
(
"ECDSA"
,
"1.2.840.10045.4.1"
,
"OID.1.2.840.10045.4.1"
),
m
(
CKM_ECDSA_SHA1
,
CKM_ECDSA
));
d
(
SIG
,
"SHA224withECDSA"
,
P11Signature
,
s
(
"1.2.840.10045.4.3.1"
,
"OID.1.2.840.10045.4.3.1"
),
...
...
@@ -675,10 +697,14 @@ public final class SunPKCS11 extends AuthProvider {
s
(
"1.2.840.10045.4.3.4"
,
"OID.1.2.840.10045.4.3.4"
),
m
(
CKM_ECDSA
));
d
(
SIG
,
"MD2withRSA"
,
P11Signature
,
s
(
"1.2.840.113549.1.1.2"
,
"OID.1.2.840.113549.1.1.2"
),
m
(
CKM_MD2_RSA_PKCS
,
CKM_RSA_PKCS
,
CKM_RSA_X_509
));
d
(
SIG
,
"MD5withRSA"
,
P11Signature
,
s
(
"1.2.840.113549.1.1.4"
,
"OID.1.2.840.113549.1.1.4"
),
m
(
CKM_MD5_RSA_PKCS
,
CKM_RSA_PKCS
,
CKM_RSA_X_509
));
d
(
SIG
,
"SHA1withRSA"
,
P11Signature
,
s
(
"1.2.840.113549.1.1.5"
,
"OID.1.2.840.113549.1.1.5"
,
"1.3.14.3.2.29"
),
m
(
CKM_SHA1_RSA_PKCS
,
CKM_RSA_PKCS
,
CKM_RSA_X_509
));
d
(
SIG
,
"SHA224withRSA"
,
P11Signature
,
s
(
"1.2.840.113549.1.1.14"
,
"OID.1.2.840.113549.1.1.14"
),
...
...
src/share/classes/sun/security/provider/DSA.java
浏览文件 @
c6552bbb
此差异已折叠。
点击以展开。
src/share/classes/sun/security/provider/DSAKeyPairGenerator.java
浏览文件 @
c6552bbb
/*
* Copyright (c) 1997, 20
05
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 20
12
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -48,8 +48,9 @@ import sun.security.jca.JCAUtil;
public
class
DSAKeyPairGenerator
extends
KeyPairGenerator
implements
java
.
security
.
interfaces
.
DSAKeyPairGenerator
{
/* The modulus length */
private
int
modlen
;
/* Length for prime P and subPrime Q in bits */
private
int
plen
;
private
int
qlen
;
/* whether to force new parameters to be generated for each KeyPair */
private
boolean
forceNewParameters
;
...
...
@@ -65,20 +66,23 @@ implements java.security.interfaces.DSAKeyPairGenerator {
initialize
(
1024
,
null
);
}
private
static
void
checkStrength
(
int
strength
)
{
if
((
strength
<
512
)
||
(
strength
>
1024
)
||
(
strength
%
64
!=
0
))
{
private
static
void
checkStrength
(
int
sizeP
,
int
sizeQ
)
{
if
((
sizeP
>=
512
)
&&
(
sizeP
<=
1024
)
&&
(
sizeP
%
64
==
0
)
&&
sizeQ
==
160
)
{
// traditional - allow for backward compatibility
// L=multiples of 64 and between 512 and 1024 (inclusive)
// N=160
}
else
if
(
sizeP
==
2048
&&
(
sizeQ
==
224
||
sizeQ
==
256
))
{
// L=2048, N=224 or 256
}
else
{
throw
new
InvalidParameterException
(
"
Modulus size must range from 512 to 1024 "
+
"and be a multiple of 64"
);
(
"
Unsupported prime and subprime size combination: "
+
sizeP
+
", "
+
sizeQ
);
}
}
public
void
initialize
(
int
modlen
,
SecureRandom
random
)
{
checkStrength
(
modlen
);
this
.
random
=
random
;
this
.
modlen
=
modlen
;
this
.
params
=
null
;
this
.
forceNewParameters
=
false
;
initialize
(
modlen
,
false
,
random
);
}
/**
...
...
@@ -86,18 +90,27 @@ implements java.security.interfaces.DSAKeyPairGenerator {
* is false, a set of pre-computed parameters is used.
*/
public
void
initialize
(
int
modlen
,
boolean
genParams
,
SecureRandom
random
)
{
checkStrength
(
modlen
);
int
subPrimeLen
=
-
1
;
if
(
modlen
<=
1024
)
{
subPrimeLen
=
160
;
}
else
if
(
modlen
==
2048
)
{
subPrimeLen
=
224
;
}
checkStrength
(
modlen
,
subPrimeLen
);
if
(
genParams
)
{
params
=
null
;
}
else
{
params
=
ParameterCache
.
getCachedDSAParameterSpec
(
modlen
);
params
=
ParameterCache
.
getCachedDSAParameterSpec
(
modlen
,
subPrimeLen
);
if
(
params
==
null
)
{
throw
new
InvalidParameterException
(
"No precomputed parameters for requested modulus size "
+
"available"
);
}
}
this
.
modlen
=
modlen
;
this
.
plen
=
modlen
;
this
.
qlen
=
subPrimeLen
;
this
.
random
=
random
;
this
.
forceNewParameters
=
genParams
;
}
...
...
@@ -136,9 +149,11 @@ implements java.security.interfaces.DSAKeyPairGenerator {
}
private
void
initialize0
(
DSAParameterSpec
params
,
SecureRandom
random
)
{
int
modlen
=
params
.
getP
().
bitLength
();
checkStrength
(
modlen
);
this
.
modlen
=
modlen
;
int
sizeP
=
params
.
getP
().
bitLength
();
int
sizeQ
=
params
.
getQ
().
bitLength
();
checkStrength
(
sizeP
,
sizeQ
);
this
.
plen
=
sizeP
;
this
.
qlen
=
sizeQ
;
this
.
params
=
params
;
this
.
random
=
random
;
this
.
forceNewParameters
=
false
;
...
...
@@ -156,11 +171,11 @@ implements java.security.interfaces.DSAKeyPairGenerator {
try
{
if
(
forceNewParameters
)
{
// generate new parameters each time
spec
=
ParameterCache
.
getNewDSAParameterSpec
(
mod
len
,
random
);
spec
=
ParameterCache
.
getNewDSAParameterSpec
(
plen
,
q
len
,
random
);
}
else
{
if
(
params
==
null
)
{
params
=
ParameterCache
.
getDSAParameterSpec
(
mod
len
,
random
);
ParameterCache
.
getDSAParameterSpec
(
plen
,
q
len
,
random
);
}
spec
=
params
;
}
...
...
@@ -203,43 +218,14 @@ implements java.security.interfaces.DSAKeyPairGenerator {
*/
private
BigInteger
generateX
(
SecureRandom
random
,
BigInteger
q
)
{
BigInteger
x
=
null
;
byte
[]
temp
=
new
byte
[
qlen
];
while
(
true
)
{
int
[]
seed
=
new
int
[
5
];
for
(
int
i
=
0
;
i
<
5
;
i
++)
{
seed
[
i
]
=
random
.
nextInt
();
}
x
=
generateX
(
seed
,
q
);
random
.
nextBytes
(
temp
);
x
=
new
BigInteger
(
1
,
temp
).
mod
(
q
);
if
(
x
.
signum
()
>
0
&&
(
x
.
compareTo
(
q
)
<
0
))
{
break
;
}
}
return
x
;
}
/**
* Given a seed, generate the private key component of the key
* pair. In the terminology used in the DSA specification
* (FIPS-186) seed is the XSEED quantity.
*
* @param seed the seed to use to generate the private key.
*/
BigInteger
generateX
(
int
[]
seed
,
BigInteger
q
)
{
// check out t in the spec.
int
[]
t
=
{
0x67452301
,
0xEFCDAB89
,
0x98BADCFE
,
0x10325476
,
0xC3D2E1F0
};
//
int
[]
tmp
=
DSA
.
SHA_7
(
seed
,
t
);
byte
[]
tmpBytes
=
new
byte
[
tmp
.
length
*
4
];
for
(
int
i
=
0
;
i
<
tmp
.
length
;
i
++)
{
int
k
=
tmp
[
i
];
for
(
int
j
=
0
;
j
<
4
;
j
++)
{
tmpBytes
[(
i
*
4
)
+
j
]
=
(
byte
)
(
k
>>>
(
24
-
(
j
*
8
)));
return
x
;
}
}
BigInteger
x
=
new
BigInteger
(
1
,
tmpBytes
).
mod
(
q
);
return
x
;
}
/**
...
...
src/share/classes/sun/security/provider/DSAParameterGenerator.java
浏览文件 @
c6552bbb
/*
* Copyright (c) 1997, 20
06
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 20
12
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -32,10 +32,12 @@ import java.security.InvalidAlgorithmParameterException;
import
java.security.NoSuchAlgorithmException
;
import
java.security.NoSuchProviderException
;
import
java.security.InvalidParameterException
;
import
java.security.MessageDigest
;
import
java.security.SecureRandom
;
import
java.security.spec.AlgorithmParameterSpec
;
import
java.security.spec.InvalidParameterSpecException
;
import
java.security.spec.DSAParameterSpec
;
import
java.security.spec.DSAGenParameterSpec
;
/**
* This class generates parameters for the DSA algorithm. It uses a default
...
...
@@ -54,8 +56,14 @@ import java.security.spec.DSAParameterSpec;
public
class
DSAParameterGenerator
extends
AlgorithmParameterGeneratorSpi
{
// the modulus length
private
int
modLen
=
1024
;
// default
// the default parameters
private
static
final
DSAGenParameterSpec
DEFAULTS
=
new
DSAGenParameterSpec
(
1024
,
160
,
160
);
// the length of prime P, subPrime Q, and seed in bits
private
int
valueL
=
-
1
;
private
int
valueN
=
-
1
;
private
int
seedLen
=
-
1
;
// the source of randomness
private
SecureRandom
random
;
...
...
@@ -65,11 +73,7 @@ public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi {
private
static
final
BigInteger
ONE
=
BigInteger
.
valueOf
(
1
);
private
static
final
BigInteger
TWO
=
BigInteger
.
valueOf
(
2
);
// Make a SHA-1 hash function
private
SHA
sha
;
public
DSAParameterGenerator
()
{
this
.
sha
=
new
SHA
();
}
/**
...
...
@@ -80,19 +84,18 @@ public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi {
* @param random the source of randomness
*/
protected
void
engineInit
(
int
strength
,
SecureRandom
random
)
{
/*
* Bruce Schneier, "Applied Cryptography", 2nd Edition,
* Description of DSA:
* [...] The algorithm uses the following parameter:
* p=a prime number L bits long, when L ranges from 512 to 1024 and is
* a multiple of 64. [...]
*/
if
((
strength
<
512
)
||
(
strength
>
1024
)
||
(
strength
%
64
!=
0
))
{
if
((
strength
>=
512
)
&&
(
strength
<=
1024
)
&&
(
strength
%
64
==
0
))
{
this
.
valueN
=
160
;
}
else
if
(
strength
==
2048
)
{
this
.
valueN
=
224
;
// } else if (strength == 3072) {
// this.valueN = 256;
}
else
{
throw
new
InvalidParameterException
(
"Prime size must range from 512 to 1024 "
+
"and be a multiple of 64"
);
(
"Prime size should be 512 - 1024, or 2048"
);
}
this
.
modLen
=
strength
;
this
.
valueL
=
strength
;
this
.
seedLen
=
valueN
;
this
.
random
=
random
;
}
...
...
@@ -100,7 +103,7 @@ public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi {
* Initializes this parameter generator with a set of
* algorithm-specific parameter generation values.
*
* @param
params
the set of algorithm-specific parameter generation values
* @param
genParamSpec
the set of algorithm-specific parameter generation values
* @param random the source of randomness
*
* @exception InvalidAlgorithmParameterException if the given parameter
...
...
@@ -109,7 +112,19 @@ public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi {
protected
void
engineInit
(
AlgorithmParameterSpec
genParamSpec
,
SecureRandom
random
)
throws
InvalidAlgorithmParameterException
{
if
(!(
genParamSpec
instanceof
DSAGenParameterSpec
))
{
throw
new
InvalidAlgorithmParameterException
(
"Invalid parameter"
);
}
DSAGenParameterSpec
dsaGenParams
=
(
DSAGenParameterSpec
)
genParamSpec
;
if
(
dsaGenParams
.
getPrimePLength
()
>
2048
)
{
throw
new
InvalidParameterException
(
"Prime size should be 512 - 1024, or 2048"
);
}
// directly initialize using the already validated values
this
.
valueL
=
dsaGenParams
.
getPrimePLength
();
this
.
valueN
=
dsaGenParams
.
getSubprimeQLength
();
this
.
seedLen
=
dsaGenParams
.
getSeedLength
();
this
.
random
=
random
;
}
/**
...
...
@@ -123,15 +138,21 @@ public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi {
if
(
this
.
random
==
null
)
{
this
.
random
=
new
SecureRandom
();
}
BigInteger
[]
pAndQ
=
generatePandQ
(
this
.
random
,
this
.
modLen
);
if
(
valueL
==
-
1
)
{
try
{
engineInit
(
DEFAULTS
,
this
.
random
);
}
catch
(
InvalidAlgorithmParameterException
iape
)
{
// should never happen
}
}
BigInteger
[]
pAndQ
=
generatePandQ
(
this
.
random
,
valueL
,
valueN
,
seedLen
);
BigInteger
paramP
=
pAndQ
[
0
];
BigInteger
paramQ
=
pAndQ
[
1
];
BigInteger
paramG
=
generateG
(
paramP
,
paramQ
);
DSAParameterSpec
dsaParamSpec
=
new
DSAParameterSpec
(
paramP
,
paramQ
,
paramG
);
DSAParameterSpec
dsaParamSpec
=
new
DSAParameterSpec
(
paramP
,
paramQ
,
paramG
);
algParams
=
AlgorithmParameters
.
getInstance
(
"DSA"
,
"SUN"
);
algParams
.
init
(
dsaParamSpec
);
}
catch
(
InvalidParameterSpecException
e
)
{
...
...
@@ -156,102 +177,98 @@ public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi {
*
* @param random the source of randomness to generate the
* seed
* @param L the size of <code>p</code>, in bits.
* @param valueL the size of <code>p</code>, in bits.
* @param valueN the size of <code>q</code>, in bits.
* @param seedLen the length of <code>seed</code>, in bits.
*
* @return an array of BigInteger, with <code>p</code> at index 0 and
* <code>q</code> at index 1.
*/
BigInteger
[]
generatePandQ
(
SecureRandom
random
,
int
L
)
{
BigInteger
[]
result
=
null
;
byte
[]
seed
=
new
byte
[
20
];
while
(
result
==
null
)
{
for
(
int
i
=
0
;
i
<
20
;
i
++)
{
seed
[
i
]
=
(
byte
)
random
.
nextInt
();
}
result
=
generatePandQ
(
seed
,
L
);
}
return
result
;
}
/*
* Generates the prime and subprime parameters for DSA.
*
* <p>The seed parameter corresponds to the <code>SEED</code> parameter
* referenced in the FIPS specification of the DSA algorithm,
* and L is the size of <code>p</code>, in bits.
*
* @param seed the seed to generate the parameters
* @param L the size of <code>p</code>, in bits.
*
* @return an array of BigInteger, with <code>p</code> at index 0,
* <code>q</code> at index 1, the seed at index 2, and the counter value
* at index 3
, or null if the seed does not yield suitable numbers
.
* at index 3.
*/
BigInteger
[]
generatePandQ
(
byte
[]
seed
,
int
L
)
{
/* Useful variables */
int
g
=
seed
.
length
*
8
;
int
n
=
(
L
-
1
)
/
160
;
int
b
=
(
L
-
1
)
%
160
;
BigInteger
SEED
=
new
BigInteger
(
1
,
seed
);
BigInteger
TWOG
=
TWO
.
pow
(
2
*
g
);
/* Step 2 (Step 1 is getting seed). */
byte
[]
U1
=
SHA
(
seed
);
byte
[]
U2
=
SHA
(
toByteArray
((
SEED
.
add
(
ONE
)).
mod
(
TWOG
)));
xor
(
U1
,
U2
);
byte
[]
U
=
U1
;
/* Step 3: For q by setting the msb and lsb to 1 */
U
[
0
]
|=
0x80
;
U
[
19
]
|=
1
;
BigInteger
q
=
new
BigInteger
(
1
,
U
);
/* Step 5 */
if
(!
q
.
isProbablePrime
(
80
))
{
return
null
;
}
else
{
BigInteger
V
[]
=
new
BigInteger
[
n
+
1
];
BigInteger
offset
=
TWO
;
/* Step 6 */
for
(
int
counter
=
0
;
counter
<
4096
;
counter
++)
{
/* Step 7 */
for
(
int
k
=
0
;
k
<=
n
;
k
++)
{
BigInteger
K
=
BigInteger
.
valueOf
(
k
);
BigInteger
tmp
=
(
SEED
.
add
(
offset
).
add
(
K
)).
mod
(
TWOG
);
V
[
k
]
=
new
BigInteger
(
1
,
SHA
(
toByteArray
(
tmp
)));
}
/* Step 8 */
BigInteger
W
=
V
[
0
];
for
(
int
i
=
1
;
i
<
n
;
i
++)
{
W
=
W
.
add
(
V
[
i
].
multiply
(
TWO
.
pow
(
i
*
160
)));
}
W
=
W
.
add
((
V
[
n
].
mod
(
TWO
.
pow
(
b
))).
multiply
(
TWO
.
pow
(
n
*
160
)));
BigInteger
TWOLm1
=
TWO
.
pow
(
L
-
1
);
BigInteger
X
=
W
.
add
(
TWOLm1
);
private
static
BigInteger
[]
generatePandQ
(
SecureRandom
random
,
int
valueL
,
int
valueN
,
int
seedLen
)
{
String
hashAlg
=
null
;
if
(
valueN
==
160
)
{
hashAlg
=
"SHA"
;
}
else
if
(
valueN
==
224
)
{
hashAlg
=
"SHA-224"
;
}
else
if
(
valueN
==
256
)
{
hashAlg
=
"SHA-256"
;
}
MessageDigest
hashObj
=
null
;
try
{
hashObj
=
MessageDigest
.
getInstance
(
hashAlg
);
}
catch
(
NoSuchAlgorithmException
nsae
)
{
// should never happen
nsae
.
printStackTrace
();
}
/* Step 9 */
BigInteger
c
=
X
.
mod
(
q
.
multiply
(
TWO
));
BigInteger
p
=
X
.
subtract
(
c
.
subtract
(
ONE
));
/* Step 3, 4: Useful variables */
int
outLen
=
hashObj
.
getDigestLength
()*
8
;
int
n
=
(
valueL
-
1
)
/
outLen
;
int
b
=
(
valueL
-
1
)
%
outLen
;
byte
[]
seedBytes
=
new
byte
[
seedLen
/
8
];
BigInteger
twoSl
=
TWO
.
pow
(
seedLen
);
int
primeCertainty
=
80
;
// for 1024-bit prime P
if
(
valueL
==
2048
)
{
primeCertainty
=
112
;
//} else if (valueL == 3072) {
// primeCertainty = 128;
}
/* Step 10 - 13 */
if
(
p
.
compareTo
(
TWOLm1
)
>
-
1
&&
p
.
isProbablePrime
(
80
))
{
BigInteger
[]
result
=
{
p
,
q
,
SEED
,
BigInteger
.
valueOf
(
counter
)};
return
result
;
}
offset
=
offset
.
add
(
BigInteger
.
valueOf
(
n
)).
add
(
ONE
);
BigInteger
resultP
,
resultQ
,
seed
=
null
;
int
counter
;
while
(
true
)
{
do
{
/* Step 5 */
random
.
nextBytes
(
seedBytes
);
seed
=
new
BigInteger
(
1
,
seedBytes
);
/* Step 6 */
BigInteger
U
=
new
BigInteger
(
1
,
hashObj
.
digest
(
seedBytes
)).
mod
(
TWO
.
pow
(
valueN
-
1
));
/* Step 7 */
resultQ
=
TWO
.
pow
(
valueN
-
1
).
add
(
U
).
add
(
ONE
).
subtract
(
U
.
mod
(
TWO
));
}
while
(!
resultQ
.
isProbablePrime
(
primeCertainty
));
/* Step 10 */
BigInteger
offset
=
ONE
;
/* Step 11 */
for
(
counter
=
0
;
counter
<
4
*
valueL
;
counter
++)
{
BigInteger
V
[]
=
new
BigInteger
[
n
+
1
];
/* Step 11.1 */
for
(
int
j
=
0
;
j
<=
n
;
j
++)
{
BigInteger
J
=
BigInteger
.
valueOf
(
j
);
BigInteger
tmp
=
(
seed
.
add
(
offset
).
add
(
J
)).
mod
(
twoSl
);
byte
[]
vjBytes
=
hashObj
.
digest
(
toByteArray
(
tmp
));
V
[
j
]
=
new
BigInteger
(
1
,
vjBytes
);
}
/* Step 11.2 */
BigInteger
W
=
V
[
0
];
for
(
int
i
=
1
;
i
<
n
;
i
++)
{
W
=
W
.
add
(
V
[
i
].
multiply
(
TWO
.
pow
(
i
*
outLen
)));
}
W
=
W
.
add
((
V
[
n
].
mod
(
TWO
.
pow
(
b
))).
multiply
(
TWO
.
pow
(
n
*
outLen
)));
/* Step 11.3 */
BigInteger
twoLm1
=
TWO
.
pow
(
valueL
-
1
);
BigInteger
X
=
W
.
add
(
twoLm1
);
/* Step 11.4, 11.5 */
BigInteger
c
=
X
.
mod
(
resultQ
.
multiply
(
TWO
));
resultP
=
X
.
subtract
(
c
.
subtract
(
ONE
));
/* Step 11.6, 11.7 */
if
(
resultP
.
compareTo
(
twoLm1
)
>
-
1
&&
resultP
.
isProbablePrime
(
primeCertainty
))
{
/* Step 11.8 */
BigInteger
[]
result
=
{
resultP
,
resultQ
,
seed
,
BigInteger
.
valueOf
(
counter
)};
return
result
;
}
/* Step 11.9 */
offset
=
offset
.
add
(
BigInteger
.
valueOf
(
n
)).
add
(
ONE
);
}
return
null
;
}
}
}
/*
...
...
@@ -262,31 +279,24 @@ public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi {
*
* @param the <code>g</code>
*/
BigInteger
generateG
(
BigInteger
p
,
BigInteger
q
)
{
private
static
BigInteger
generateG
(
BigInteger
p
,
BigInteger
q
)
{
BigInteger
h
=
ONE
;
/* Step 1 */
BigInteger
pMinusOneOverQ
=
(
p
.
subtract
(
ONE
)).
divide
(
q
);
BigInteger
g
=
ONE
;
while
(
g
.
compareTo
(
TWO
)
<
0
)
{
g
=
h
.
modPow
(
pMinusOneOverQ
,
p
);
BigInteger
resultG
=
ONE
;
while
(
resultG
.
compareTo
(
TWO
)
<
0
)
{
/* Step 3 */
resultG
=
h
.
modPow
(
pMinusOneOverQ
,
p
);
h
=
h
.
add
(
ONE
);
}
return
g
;
}
/*
* Returns the SHA-1 digest of some data
*/
private
byte
[]
SHA
(
byte
[]
array
)
{
sha
.
engineReset
();
sha
.
engineUpdate
(
array
,
0
,
array
.
length
);
return
sha
.
engineDigest
();
return
resultG
;
}
/*
* Converts the result of a BigInteger.toByteArray call to an exact
* signed magnitude representation for any positive number.
*/
private
byte
[]
toByteArray
(
BigInteger
bigInt
)
{
private
static
byte
[]
toByteArray
(
BigInteger
bigInt
)
{
byte
[]
result
=
bigInt
.
toByteArray
();
if
(
result
[
0
]
==
0
)
{
byte
[]
tmp
=
new
byte
[
result
.
length
-
1
];
...
...
@@ -295,13 +305,4 @@ public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi {
}
return
result
;
}
/*
* XORs U2 into U1
*/
private
void
xor
(
byte
[]
U1
,
byte
[]
U2
)
{
for
(
int
i
=
0
;
i
<
U1
.
length
;
i
++)
{
U1
[
i
]
^=
U2
[
i
];
}
}
}
src/share/classes/sun/security/provider/ParameterCache.java
浏览文件 @
c6552bbb
/*
* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003,
2012,
Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -26,6 +26,7 @@
package
sun.security.provider
;
import
java.util.*
;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.math.BigInteger
;
import
java.security.*
;
...
...
@@ -55,11 +56,17 @@ public final class ParameterCache {
private
final
static
Map
<
Integer
,
DHParameterSpec
>
dhCache
;
/**
* Return cached DSA parameters for the given
keylength, or null if none
* are available in the cache.
* Return cached DSA parameters for the given
length combination of
*
prime and subprime, or null if none
are available in the cache.
*/
public
static
DSAParameterSpec
getCachedDSAParameterSpec
(
int
keyLength
)
{
return
dsaCache
.
get
(
Integer
.
valueOf
(
keyLength
));
public
static
DSAParameterSpec
getCachedDSAParameterSpec
(
int
primeLen
,
int
subprimeLen
)
{
// ensure the sum is unique in all cases, i.e.
// case#1: (512 <= p <= 1024) AND q=160
// case#2: p=2048 AND q=224
// case#3: p=2048 AND q=256
// (NOT-YET-SUPPORTED)case#4: p=3072 AND q=256
return
dsaCache
.
get
(
Integer
.
valueOf
(
primeLen
+
subprimeLen
));
}
/**
...
...
@@ -71,18 +78,39 @@ public final class ParameterCache {
}
/**
* Return DSA parameters for the given keylength. Uses cache if possible,
* generates new parameters and adds them to the cache otherwise.
* Return DSA parameters for the given primeLen. Uses cache if
* possible, generates new parameters and adds them to the cache
* otherwise.
*/
public
static
DSAParameterSpec
getDSAParameterSpec
(
int
keyLength
,
public
static
DSAParameterSpec
getDSAParameterSpec
(
int
primeLen
,
SecureRandom
random
)
throws
NoSuchAlgorithmException
,
InvalidParameterSpecException
{
DSAParameterSpec
spec
=
getCachedDSAParameterSpec
(
keyLength
);
throws
NoSuchAlgorithmException
,
InvalidParameterSpecException
,
InvalidAlgorithmParameterException
{
if
(
primeLen
<=
1024
)
{
return
getDSAParameterSpec
(
primeLen
,
160
,
random
);
}
else
if
(
primeLen
==
2048
)
{
return
getDSAParameterSpec
(
primeLen
,
224
,
random
);
}
else
{
return
null
;
}
}
/**
* Return DSA parameters for the given primeLen and subprimeLen.
* Uses cache if possible, generates new parameters and adds them to the
* cache otherwise.
*/
public
static
DSAParameterSpec
getDSAParameterSpec
(
int
primeLen
,
int
subprimeLen
,
SecureRandom
random
)
throws
NoSuchAlgorithmException
,
InvalidParameterSpecException
,
InvalidAlgorithmParameterException
{
DSAParameterSpec
spec
=
getCachedDSAParameterSpec
(
primeLen
,
subprimeLen
);
if
(
spec
!=
null
)
{
return
spec
;
}
spec
=
getNewDSAParameterSpec
(
keyLength
,
random
);
dsaCache
.
put
(
Integer
.
valueOf
(
keyLength
),
spec
);
spec
=
getNewDSAParameterSpec
(
primeLen
,
subprimeLen
,
random
);
dsaCache
.
put
(
Integer
.
valueOf
(
primeLen
+
subprimeLen
),
spec
);
return
spec
;
}
...
...
@@ -107,28 +135,28 @@ public final class ParameterCache {
}
/**
* Return new DSA parameters for the given
keylength. Do not lookup in
*
cache and do not cache the newly generated parameters. This metho
d
* really only exists for the legacy method
* Return new DSA parameters for the given
length combination of prime and
*
sub prime. Do not lookup in cache and do not cache the newly generate
d
*
parameters. This method
really only exists for the legacy method
* DSAKeyPairGenerator.initialize(int, boolean, SecureRandom).
*/
public
static
DSAParameterSpec
getNewDSAParameterSpec
(
int
keyLength
,
SecureRandom
random
)
throws
NoSuchAlgorithmException
,
InvalidParameterSpecException
{
public
static
DSAParameterSpec
getNewDSAParameterSpec
(
int
primeLen
,
int
subprimeLen
,
SecureRandom
random
)
throws
NoSuchAlgorithmException
,
InvalidParameterSpecException
,
InvalidAlgorithmParameterException
{
AlgorithmParameterGenerator
gen
=
AlgorithmParameterGenerator
.
getInstance
(
"DSA"
);
gen
.
init
(
keyLength
,
random
);
DSAGenParameterSpec
genParams
=
new
DSAGenParameterSpec
(
primeLen
,
subprimeLen
);
gen
.
init
(
genParams
,
random
);
AlgorithmParameters
params
=
gen
.
generateParameters
();
DSAParameterSpec
spec
=
params
.
getParameterSpec
(
DSAParameterSpec
.
class
);
return
spec
;
}
static
{
// XXX change to ConcurrentHashMap once available
dhCache
=
Collections
.
synchronizedMap
(
new
HashMap
<
Integer
,
DHParameterSpec
>());
dsaCache
=
Collections
.
synchronizedMap
(
new
HashMap
<
Integer
,
DSAParameterSpec
>());
dhCache
=
new
ConcurrentHashMap
<
Integer
,
DHParameterSpec
>();
dsaCache
=
new
ConcurrentHashMap
<
Integer
,
DSAParameterSpec
>();
/*
* We support precomputed parameter for 512, 768 and 1024 bit
...
...
@@ -210,17 +238,99 @@ public final class ParameterCache {
"83dfe15ae59f06928b665e807b552564014c3bfecf"
+
"492a"
,
16
);
dsaCache
.
put
(
Integer
.
valueOf
(
512
),
dsaCache
.
put
(
Integer
.
valueOf
(
512
+
160
),
new
DSAParameterSpec
(
p512
,
q512
,
g512
));
dsaCache
.
put
(
Integer
.
valueOf
(
768
),
dsaCache
.
put
(
Integer
.
valueOf
(
768
+
160
),
new
DSAParameterSpec
(
p768
,
q768
,
g768
));
dsaCache
.
put
(
Integer
.
valueOf
(
1024
),
dsaCache
.
put
(
Integer
.
valueOf
(
1024
+
160
),
new
DSAParameterSpec
(
p1024
,
q1024
,
g1024
));
/*
* L = 2048, N = 224
* SEED = 584236080cfa43c09b02354135f4cc5198a19efada08bd866d601ba4
* counter = 2666
*/
BigInteger
p2048_224
=
new
BigInteger
(
"8f7935d9b9aae9bfabed887acf4951b6f32ec59e3b"
+
"af3718e8eac4961f3efd3606e74351a9c4183339b8"
+
"09e7c2ae1c539ba7475b85d011adb8b47987754984"
+
"695cac0e8f14b3360828a22ffa27110a3d62a99345"
+
"3409a0fe696c4658f84bdd20819c3709a01057b195"
+
"adcd00233dba5484b6291f9d648ef883448677979c"
+
"ec04b434a6ac2e75e9985de23db0292fc1118c9ffa"
+
"9d8181e7338db792b730d7b9e349592f6809987215"
+
"3915ea3d6b8b4653c633458f803b32a4c2e0f27290"
+
"256e4e3f8a3b0838a1c450e4e18c1a29a37ddf5ea1"
+
"43de4b66ff04903ed5cf1623e158d487c608e97f21"
+
"1cd81dca23cb6e380765f822e342be484c05763939"
+
"601cd667"
,
16
);
BigInteger
q2048_224
=
new
BigInteger
(
"baf696a68578f7dfdee7fa67c977c785ef32b233ba"
+
"e580c0bcd5695d"
,
16
);
BigInteger
g2048_224
=
new
BigInteger
(
"16a65c58204850704e7502a39757040d34da3a3478"
+
"c154d4e4a5c02d242ee04f96e61e4bd0904abdac8f"
+
"37eeb1e09f3182d23c9043cb642f88004160edf9ca"
+
"09b32076a79c32a627f2473e91879ba2c4e744bd20"
+
"81544cb55b802c368d1fa83ed489e94e0fa0688e32"
+
"428a5c78c478c68d0527b71c9a3abb0b0be12c4468"
+
"9639e7d3ce74db101a65aa2b87f64c6826db3ec72f"
+
"4b5599834bb4edb02f7c90e9a496d3a55d535bebfc"
+
"45d4f619f63f3dedbb873925c2f224e07731296da8"
+
"87ec1e4748f87efb5fdeb75484316b2232dee553dd"
+
"af02112b0d1f02da30973224fe27aeda8b9d4b2922"
+
"d9ba8be39ed9e103a63c52810bc688b7e2ed4316e1"
+
"ef17dbde"
,
16
);
dsaCache
.
put
(
Integer
.
valueOf
(
2048
+
224
),
new
DSAParameterSpec
(
p2048_224
,
q2048_224
,
g2048_224
));
/*
* L = 2048, N = 256
* SEED = b0b4417601b59cbc9d8ac8f935cadaec4f5fbb2f23785609ae466748d9b5a536
* counter = 497
*/
BigInteger
p2048_256
=
new
BigInteger
(
"95475cf5d93e596c3fcd1d902add02f427f5f3c721"
+
"0313bb45fb4d5bb2e5fe1cbd678cd4bbdd84c9836b"
+
"e1f31c0777725aeb6c2fc38b85f48076fa76bcd814"
+
"6cc89a6fb2f706dd719898c2083dc8d896f84062e2"
+
"c9c94d137b054a8d8096adb8d51952398eeca852a0"
+
"af12df83e475aa65d4ec0c38a9560d5661186ff98b"
+
"9fc9eb60eee8b030376b236bc73be3acdbd74fd61c"
+
"1d2475fa3077b8f080467881ff7e1ca56fee066d79"
+
"506ade51edbb5443a563927dbc4ba520086746175c"
+
"8885925ebc64c6147906773496990cb714ec667304"
+
"e261faee33b3cbdf008e0c3fa90650d97d3909c927"
+
"5bf4ac86ffcb3d03e6dfc8ada5934242dd6d3bcca2"
+
"a406cb0b"
,
16
);
BigInteger
q2048_256
=
new
BigInteger
(
"f8183668ba5fc5bb06b5981e6d8b795d30b8978d43"
+
"ca0ec572e37e09939a9773"
,
16
);
BigInteger
g2048_256
=
new
BigInteger
(
"42debb9da5b3d88cc956e08787ec3f3a09bba5f48b"
+
"889a74aaf53174aa0fbe7e3c5b8fcd7a53bef563b0"
+
"e98560328960a9517f4014d3325fc7962bf1e04937"
+
"0d76d1314a76137e792f3f0db859d095e4a5b93202"
+
"4f079ecf2ef09c797452b0770e1350782ed57ddf79"
+
"4979dcef23cb96f183061965c4ebc93c9c71c56b92"
+
"5955a75f94cccf1449ac43d586d0beee43251b0b22"
+
"87349d68de0d144403f13e802f4146d882e057af19"
+
"b6f6275c6676c8fa0e3ca2713a3257fd1b27d0639f"
+
"695e347d8d1cf9ac819a26ca9b04cb0eb9b7b03598"
+
"8d15bbac65212a55239cfc7e58fae38d7250ab9991"
+
"ffbc97134025fe8ce04c4399ad96569be91a546f49"
+
"78693c7a"
,
16
);
dsaCache
.
put
(
Integer
.
valueOf
(
2048
+
256
),
new
DSAParameterSpec
(
p2048_256
,
q2048_256
,
g2048_256
));
// use DSA parameters for DH as well
dhCache
.
put
(
Integer
.
valueOf
(
512
),
new
DHParameterSpec
(
p512
,
g512
));
dhCache
.
put
(
Integer
.
valueOf
(
768
),
new
DHParameterSpec
(
p768
,
g768
));
dhCache
.
put
(
Integer
.
valueOf
(
1024
),
new
DHParameterSpec
(
p1024
,
g1024
));
dhCache
.
put
(
Integer
.
valueOf
(
2048
),
new
DHParameterSpec
(
p2048_224
,
g2048_224
));
}
}
src/share/classes/sun/security/provider/SunEntries.java
浏览文件 @
c6552bbb
...
...
@@ -47,6 +47,10 @@ import java.security.*;
* SHA-2 family of hash functions includes SHA-224, SHA-256, SHA-384,
* and SHA-512.
*
* - SHA-224withDSA/SHA-256withDSA are the signature schemes
* described in FIPS 186-3. The associated object identifiers are
* "OID.2.16.840.1.101.3.4.3.1", and "OID.2.16.840.1.101.3.4.3.2".
* - DSA is the key generation scheme as described in FIPS 186.
* Aliases for DSA include the OID strings "OID.1.3.14.3.2.12"
* and "OID.1.2.840.10040.4.1".
...
...
@@ -106,11 +110,15 @@ final class SunEntries {
map
.
put
(
"Signature.SHA1withDSA"
,
"sun.security.provider.DSA$SHA1withDSA"
);
map
.
put
(
"Signature.NONEwithDSA"
,
"sun.security.provider.DSA$RawDSA"
);
map
.
put
(
"Alg.Alias.Signature.RawDSA"
,
"NONEwithDSA"
);
map
.
put
(
"Signature.SHA224withDSA"
,
"sun.security.provider.DSA$SHA224withDSA"
);
map
.
put
(
"Signature.SHA256withDSA"
,
"sun.security.provider.DSA$SHA256withDSA"
);
String
dsaKeyClasses
=
"java.security.interfaces.DSAPublicKey"
+
"|java.security.interfaces.DSAPrivateKey"
;
map
.
put
(
"Signature.SHA1withDSA SupportedKeyClasses"
,
dsaKeyClasses
);
map
.
put
(
"Signature.NONEwithDSA SupportedKeyClasses"
,
dsaKeyClasses
);
map
.
put
(
"Signature.SHA224withDSA SupportedKeyClasses"
,
dsaKeyClasses
);
map
.
put
(
"Signature.SHA256withDSA SupportedKeyClasses"
,
dsaKeyClasses
);
map
.
put
(
"Alg.Alias.Signature.DSA"
,
"SHA1withDSA"
);
map
.
put
(
"Alg.Alias.Signature.DSS"
,
"SHA1withDSA"
);
...
...
@@ -124,6 +132,10 @@ final class SunEntries {
map
.
put
(
"Alg.Alias.Signature.1.2.840.10040.4.3"
,
"SHA1withDSA"
);
map
.
put
(
"Alg.Alias.Signature.1.3.14.3.2.13"
,
"SHA1withDSA"
);
map
.
put
(
"Alg.Alias.Signature.1.3.14.3.2.27"
,
"SHA1withDSA"
);
map
.
put
(
"Alg.Alias.Signature.OID.2.16.840.1.101.3.4.3.1"
,
"SHA224withDSA"
);
map
.
put
(
"Alg.Alias.Signature.2.16.840.1.101.3.4.3.1"
,
"SHA224withDSA"
);
map
.
put
(
"Alg.Alias.Signature.OID.2.16.840.1.101.3.4.3.2"
,
"SHA256withDSA"
);
map
.
put
(
"Alg.Alias.Signature.2.16.840.1.101.3.4.3.2"
,
"SHA256withDSA"
);
/*
* Key Pair Generator engines
...
...
@@ -143,6 +155,8 @@ final class SunEntries {
map
.
put
(
"Alg.Alias.MessageDigest.SHA-1"
,
"SHA"
);
map
.
put
(
"Alg.Alias.MessageDigest.SHA1"
,
"SHA"
);
map
.
put
(
"Alg.Alias.MessageDigest.1.3.14.3.2.26"
,
"SHA"
);
map
.
put
(
"Alg.Alias.MessageDigest.OID.1.3.14.3.2.26"
,
"SHA"
);
map
.
put
(
"MessageDigest.SHA-224"
,
"sun.security.provider.SHA2$SHA224"
);
map
.
put
(
"Alg.Alias.MessageDigest.2.16.840.1.101.3.4.2.4"
,
"SHA-224"
);
...
...
@@ -169,15 +183,17 @@ final class SunEntries {
*/
map
.
put
(
"AlgorithmParameters.DSA"
,
"sun.security.provider.DSAParameters"
);
map
.
put
(
"Alg.Alias.AlgorithmParameters.
1.3.14.3.2.12
"
,
"DSA"
);
map
.
put
(
"Alg.Alias.AlgorithmParameters.
OID.1.2.840.10040.4.1
"
,
"DSA"
);
map
.
put
(
"Alg.Alias.AlgorithmParameters.1.2.840.10040.4.1"
,
"DSA"
);
map
.
put
(
"Alg.Alias.AlgorithmParameters.1.3.14.3.2.12"
,
"DSA"
);
/*
* Key factories
*/
map
.
put
(
"KeyFactory.DSA"
,
"sun.security.provider.DSAKeyFactory"
);
map
.
put
(
"Alg.Alias.KeyFactory.
1.3.14.3.2.12
"
,
"DSA"
);
map
.
put
(
"Alg.Alias.KeyFactory.
OID.1.2.840.10040.4.1
"
,
"DSA"
);
map
.
put
(
"Alg.Alias.KeyFactory.1.2.840.10040.4.1"
,
"DSA"
);
map
.
put
(
"Alg.Alias.KeyFactory.1.3.14.3.2.12"
,
"DSA"
);
/*
* Certificates
...
...
@@ -234,9 +250,13 @@ final class SunEntries {
/*
* KeySize
*/
map
.
put
(
"Signature.NONEwithDSA KeySize"
,
"1024"
);
map
.
put
(
"Signature.SHA1withDSA KeySize"
,
"1024"
);
map
.
put
(
"KeyPairGenerator.DSA KeySize"
,
"1024"
);
map
.
put
(
"AlgorithmParameterGenerator.DSA KeySize"
,
"1024"
);
map
.
put
(
"Signature.SHA224withDSA KeySize"
,
"2048"
);
map
.
put
(
"Signature.SHA256withDSA KeySize"
,
"2048"
);
map
.
put
(
"KeyPairGenerator.DSA KeySize"
,
"2048"
);
map
.
put
(
"AlgorithmParameterGenerator.DSA KeySize"
,
"2048"
);
/*
* Implementation type: software or hardware
...
...
src/share/classes/sun/security/x509/AlgorithmId.java
浏览文件 @
c6552bbb
...
...
@@ -120,21 +120,14 @@ public class AlgorithmId implements Serializable, DerEncoder {
try
{
algParams
=
AlgorithmParameters
.
getInstance
(
algidString
);
}
catch
(
NoSuchAlgorithmException
e
)
{
try
{
// Try the internal EC code so that we can fully parse EC
// keys even if the provider is not registered.
// This code can go away once we have EC in the SUN provider.
algParams
=
AlgorithmParameters
.
getInstance
(
algidString
,
sun
.
security
.
ec
.
ECKeyFactory
.
ecInternalProvider
);
}
catch
(
NoSuchAlgorithmException
ee
)
{
/*
* This algorithm parameter type is not supported, so we cannot
* parse the parameters.
*/
algParams
=
null
;
return
;
}
/*
* This algorithm parameter type is not supported, so we cannot
* parse the parameters.
*/
algParams
=
null
;
return
;
}
// Decode (parse) the parameters
algParams
.
init
(
params
.
toByteArray
());
}
...
...
@@ -505,6 +498,9 @@ public class AlgorithmId implements Serializable, DerEncoder {
if
(
name
.
equalsIgnoreCase
(
"EC"
))
{
return
EC_oid
;
}
if
(
name
.
equalsIgnoreCase
(
"ECDH"
))
{
return
AlgorithmId
.
ECDH_oid
;
}
// Common signature types
if
(
name
.
equalsIgnoreCase
(
"MD5withRSA"
)
...
...
@@ -524,6 +520,12 @@ public class AlgorithmId implements Serializable, DerEncoder {
||
name
.
equalsIgnoreCase
(
"SHA-1/DSA"
))
{
return
AlgorithmId
.
sha1WithDSA_oid
;
}
if
(
name
.
equalsIgnoreCase
(
"SHA224WithDSA"
))
{
return
AlgorithmId
.
sha224WithDSA_oid
;
}
if
(
name
.
equalsIgnoreCase
(
"SHA256WithDSA"
))
{
return
AlgorithmId
.
sha256WithDSA_oid
;
}
if
(
name
.
equalsIgnoreCase
(
"SHA1WithRSA"
)
||
name
.
equalsIgnoreCase
(
"SHA1/RSA"
))
{
return
AlgorithmId
.
sha1WithRSAEncryption_oid
;
...
...
@@ -654,6 +656,7 @@ public class AlgorithmId implements Serializable, DerEncoder {
public
static
final
ObjectIdentifier
DSA_oid
;
public
static
final
ObjectIdentifier
DSA_OIW_oid
;
public
static
final
ObjectIdentifier
EC_oid
=
oid
(
1
,
2
,
840
,
10045
,
2
,
1
);
public
static
final
ObjectIdentifier
ECDH_oid
=
oid
(
1
,
3
,
132
,
1
,
12
);
public
static
final
ObjectIdentifier
RSA_oid
;
public
static
final
ObjectIdentifier
RSAEncryption_oid
;
...
...
@@ -694,6 +697,10 @@ public class AlgorithmId implements Serializable, DerEncoder {
public
static
final
ObjectIdentifier
shaWithDSA_OIW_oid
;
public
static
final
ObjectIdentifier
sha1WithDSA_OIW_oid
;
public
static
final
ObjectIdentifier
sha1WithDSA_oid
;
public
static
final
ObjectIdentifier
sha224WithDSA_oid
=
oid
(
2
,
16
,
840
,
1
,
101
,
3
,
4
,
3
,
1
);
public
static
final
ObjectIdentifier
sha256WithDSA_oid
=
oid
(
2
,
16
,
840
,
1
,
101
,
3
,
4
,
3
,
2
);
public
static
final
ObjectIdentifier
sha1WithECDSA_oid
=
oid
(
1
,
2
,
840
,
10045
,
4
,
1
);
...
...
@@ -725,7 +732,6 @@ public class AlgorithmId implements Serializable, DerEncoder {
public
static
ObjectIdentifier
pbeWithSHA1AndRC2_40_oid
=
ObjectIdentifier
.
newInternal
(
new
int
[]
{
1
,
2
,
840
,
113549
,
1
,
12
,
1
,
6
});
static
{
/*
* Note the preferred OIDs are named simply with no "OIW" or
...
...
@@ -885,6 +891,8 @@ public class AlgorithmId implements Serializable, DerEncoder {
nameTable
.
put
(
DSA_oid
,
"DSA"
);
nameTable
.
put
(
DSA_OIW_oid
,
"DSA"
);
nameTable
.
put
(
EC_oid
,
"EC"
);
nameTable
.
put
(
ECDH_oid
,
"ECDH"
);
nameTable
.
put
(
sha1WithECDSA_oid
,
"SHA1withECDSA"
);
nameTable
.
put
(
sha224WithECDSA_oid
,
"SHA224withECDSA"
);
nameTable
.
put
(
sha256WithECDSA_oid
,
"SHA256withECDSA"
);
...
...
@@ -895,6 +903,8 @@ public class AlgorithmId implements Serializable, DerEncoder {
nameTable
.
put
(
sha1WithDSA_oid
,
"SHA1withDSA"
);
nameTable
.
put
(
sha1WithDSA_OIW_oid
,
"SHA1withDSA"
);
nameTable
.
put
(
shaWithDSA_OIW_oid
,
"SHA1withDSA"
);
nameTable
.
put
(
sha224WithDSA_oid
,
"SHA224withDSA"
);
nameTable
.
put
(
sha256WithDSA_oid
,
"SHA256withDSA"
);
nameTable
.
put
(
sha1WithRSAEncryption_oid
,
"SHA1withRSA"
);
nameTable
.
put
(
sha1WithRSAEncryption_OIW_oid
,
"SHA1withRSA"
);
nameTable
.
put
(
sha224WithRSAEncryption_oid
,
"SHA224withRSA"
);
...
...
src/share/demo/jvmti/hprof/debug_malloc.h
浏览文件 @
c6552bbb
...
...
@@ -59,6 +59,11 @@
#include <stdlib.h>
#include <string.h>
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
/* The real functions behind the macro curtains. */
void
*
debug_malloc
(
size_t
,
const
char
*
,
int
);
...
...
@@ -71,10 +76,10 @@ void debug_free(void *, const char *, int);
void
debug_malloc_verify
(
const
char
*
,
int
);
#undef malloc_verify
#define malloc_verify() debug_malloc_verify(
__FILE__
, __LINE__)
#define malloc_verify() debug_malloc_verify(
THIS_FILE
, __LINE__)
void
debug_malloc_police
(
const
char
*
,
int
);
#undef malloc_police
#define malloc_police() debug_malloc_police(
__FILE__
, __LINE__)
#define malloc_police() debug_malloc_police(
THIS_FILE
, __LINE__)
#endif
src/share/demo/jvmti/hprof/hprof_error.h
浏览文件 @
c6552bbb
...
...
@@ -41,20 +41,25 @@
#ifndef HPROF_ERROR_H
#define HPROF_ERROR_H
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
/* Macros over assert and error functions so we can capture the source loc. */
#define HPROF_BOOL(x) ((jboolean)((x)==0?JNI_FALSE:JNI_TRUE))
#define HPROF_ERROR(fatal,msg) \
error_handler(HPROF_BOOL(fatal), JVMTI_ERROR_NONE, msg,
__FILE__
, __LINE__)
error_handler(HPROF_BOOL(fatal), JVMTI_ERROR_NONE, msg,
THIS_FILE
, __LINE__)
#define HPROF_JVMTI_ERROR(error,msg) \
error_handler(HPROF_BOOL(error!=JVMTI_ERROR_NONE), \
error, msg,
__FILE__
, __LINE__)
error, msg,
THIS_FILE
, __LINE__)
#if defined(DEBUG) || !defined(NDEBUG)
#define HPROF_ASSERT(cond) \
(((int)(cond))?(void)0:error_assert(#cond,
__FILE__
, __LINE__))
(((int)(cond))?(void)0:error_assert(#cond,
THIS_FILE
, __LINE__))
#else
#define HPROF_ASSERT(cond)
#endif
...
...
@@ -77,11 +82,11 @@
#define LOG_FORMAT(format) "HPROF LOG: " format " [%s:%d]\n"
#define LOG1(str1) LOG_STDERR((stderr, LOG_FORMAT("%s"), \
str1,
__FILE__
, __LINE__ ))
str1,
THIS_FILE
, __LINE__ ))
#define LOG2(str1,str2) LOG_STDERR((stderr, LOG_FORMAT("%s %s"), \
str1, str2,
__FILE__
, __LINE__ ))
str1, str2,
THIS_FILE
, __LINE__ ))
#define LOG3(str1,str2,num) LOG_STDERR((stderr, LOG_FORMAT("%s %s 0x%x"), \
str1, str2, num,
__FILE__
, __LINE__ ))
str1, str2, num,
THIS_FILE
, __LINE__ ))
#define LOG(str) LOG1(str)
...
...
src/share/demo/jvmti/hprof/hprof_util.h
浏览文件 @
c6552bbb
...
...
@@ -41,6 +41,11 @@
#ifndef HPROF_UTIL_H
#define HPROF_UTIL_H
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
/* Macros that protect code from accidently using a local ref improperly */
#define WITH_LOCAL_REFS(env, number) \
{ \
...
...
@@ -184,8 +189,8 @@ void hprof_free(void *ptr);
#ifdef DEBUG
void
*
hprof_debug_malloc
(
int
size
,
char
*
file
,
int
line
);
void
hprof_debug_free
(
void
*
ptr
,
char
*
file
,
int
line
);
#define HPROF_MALLOC(size) hprof_debug_malloc(size,
__FILE__
, __LINE__)
#define HPROF_FREE(ptr) hprof_debug_free(ptr,
__FILE__
, __LINE__)
#define HPROF_MALLOC(size) hprof_debug_malloc(size,
THIS_FILE
, __LINE__)
#define HPROF_FREE(ptr) hprof_debug_free(ptr,
THIS_FILE
, __LINE__)
#else
#define HPROF_MALLOC(size) hprof_malloc(size)
#define HPROF_FREE(ptr) hprof_free(ptr)
...
...
src/share/demo/jvmti/java_crw_demo/java_crw_demo.c
浏览文件 @
c6552bbb
...
...
@@ -70,12 +70,20 @@
/* Macros over error functions to capture line numbers */
#define CRW_FATAL(ci, message) fatal_error(ci, message, __FILE__, __LINE__)
/* Fatal error used in all builds. */
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE "java_crw.demo.c"
/* Never use __FILE__ */
#endif
#define CRW_FATAL(ci, message) fatal_error(ci, message, THIS_FILE, __LINE__)
#if defined(DEBUG) || !defined(NDEBUG)
/* This assert macro is only used in the debug builds. */
#define CRW_ASSERT(ci, cond) \
((cond)?(void)0:assert_error(ci, #cond,
__FILE__
, __LINE__))
((cond)?(void)0:assert_error(ci, #cond,
THIS_FILE
, __LINE__))
#else
...
...
src/share/instrument/JPLISAssert.h
浏览文件 @
c6552bbb
...
...
@@ -49,10 +49,14 @@ extern "C" {
#define JPLISASSERT_ENABLEASSERTIONS (0)
#endif
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
#if JPLISASSERT_ENABLEASSERTIONS
#define jplis_assert(x) JPLISAssertCondition((jboolean)(x), #x,
__FILE__
, __LINE__)
#define jplis_assert_msg(x, msg) JPLISAssertConditionWithMessage((jboolean)(x), #x, msg,
__FILE__
, __LINE__)
#define jplis_assert(x) JPLISAssertCondition((jboolean)(x), #x,
THIS_FILE
, __LINE__)
#define jplis_assert_msg(x, msg) JPLISAssertConditionWithMessage((jboolean)(x), #x, msg,
THIS_FILE
, __LINE__)
#else
#define jplis_assert(x)
#define jplis_assert_msg(x, msg)
...
...
src/share/native/sun/awt/debug/debug_assert.h
浏览文件 @
c6552bbb
...
...
@@ -32,17 +32,22 @@ extern "C" {
#include "debug_util.h"
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
#if defined(DEBUG)
#define DASSERT(_expr) \
if ( !(_expr) ) { \
DAssert_Impl( #_expr,
__FILE__
, __LINE__); \
DAssert_Impl( #_expr,
THIS_FILE
, __LINE__); \
} else { \
}
#define DASSERTMSG(_expr, _msg) \
if ( !(_expr) ) { \
DAssert_Impl( (_msg),
__FILE__
, __LINE__); \
DAssert_Impl( (_msg),
THIS_FILE
, __LINE__); \
} else { \
}
...
...
src/share/native/sun/awt/debug/debug_mem.c
浏览文件 @
c6552bbb
...
...
@@ -27,6 +27,11 @@
#include "debug_util.h"
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
#define DMEM_MIN(a,b) (a) < (b) ? (a) : (b)
#define DMEM_MAX(a,b) (a) > (b) ? (a) : (b)
...
...
@@ -291,7 +296,7 @@ void DMem_ReportLeaks() {
DMutex_Enter
(
DMemMutex
);
/* Force memory leaks to be output regardless of trace settings */
DTrace_EnableFile
(
__FILE__
,
TRUE
);
DTrace_EnableFile
(
THIS_FILE
,
TRUE
);
DTRACE_PRINTLN
(
"--------------------------"
);
DTRACE_PRINTLN
(
"Debug Memory Manager Leaks"
);
DTRACE_PRINTLN
(
"--------------------------"
);
...
...
src/share/native/sun/awt/debug/debug_trace.h
浏览文件 @
c6552bbb
...
...
@@ -34,6 +34,11 @@ extern "C" {
#include "debug_util.h"
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
typedef
int
dtrace_id
;
enum
{
UNDEFINED_TRACE_ID
=
-
1
/* indicates trace point has not been registered yet */
...
...
@@ -69,7 +74,7 @@ static dtrace_id _Dt_FileTraceId = UNDEFINED_TRACE_ID;
#define _DTrace_Template(_func, _ac, _f, _a1, _a2, _a3, _a4, _a5, _a6, _a7, _a8) \
{ \
static dtrace_id _dt_lineid_ = UNDEFINED_TRACE_ID; \
DTrace_PrintFunction((_func), &_Dt_FileTraceId, &_dt_lineid_,
__FILE__
, __LINE__, (_ac), (_f), (_a1), (_a2), (_a3), (_a4), (_a5), (_a6), (_a7), (_a8) ); \
DTrace_PrintFunction((_func), &_Dt_FileTraceId, &_dt_lineid_,
THIS_FILE
, __LINE__, (_ac), (_f), (_a1), (_a2), (_a3), (_a4), (_a5), (_a6), (_a7), (_a8) ); \
}
/* printf style trace macros */
...
...
src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
浏览文件 @
c6552bbb
...
...
@@ -452,7 +452,12 @@ extern CK_C_INITIALIZE_ARGS_PTR ckpGlobalInitArgs;
void
*
p11malloc
(
size_t
c
,
char
*
file
,
int
line
);
void
p11free
(
void
*
p
,
char
*
file
,
int
line
);
#define malloc(c) (p11malloc((c), __FILE__, __LINE__))
#define free(c) (p11free((c), __FILE__, __LINE__))
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
#define malloc(c) (p11malloc((c), THIS_FILE, __LINE__))
#define free(c) (p11free((c), THIS_FILE, __LINE__))
#endif
src/share/npt/utf.h
浏览文件 @
c6552bbb
...
...
@@ -33,8 +33,13 @@
#include "jni.h"
#include "utf_md.h"
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
/* Error and assert macros */
#define UTF_ERROR(m) utfError(
__FILE__
, __LINE__, m)
#define UTF_ERROR(m) utfError(
THIS_FILE
, __LINE__, m)
#define UTF_ASSERT(x) ( (x)==0 ? UTF_ERROR("ASSERT ERROR " #x) : (void)0 )
void
utfError
(
char
*
file
,
int
line
,
char
*
message
);
...
...
src/share/transport/shmem/shmemBase.h
浏览文件 @
c6552bbb
...
...
@@ -49,11 +49,16 @@ jint shmemBase_receivePacket(SharedMemoryConnection *, jdwpPacket *packet);
jint
shmemBase_name
(
SharedMemoryTransport
*
,
char
**
name
);
jint
shmemBase_getlasterror
(
char
*
msg
,
jint
size
);
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
#ifdef DEBUG
#define SHMEM_ASSERT(expression) \
do { \
if (!(expression)) { \
exitTransportWithError("assertion failed",
__FILE__
, __DATE__, __LINE__); \
exitTransportWithError("assertion failed",
THIS_FILE
, __DATE__, __LINE__); \
} \
} while (0)
#else
...
...
@@ -63,7 +68,7 @@ do { \
#define SHMEM_GUARANTEE(expression) \
do { \
if (!(expression)) { \
exitTransportWithError("assertion failed",
__FILE__
, __DATE__, __LINE__); \
exitTransportWithError("assertion failed",
THIS_FILE
, __DATE__, __LINE__); \
} \
} while (0)
...
...
src/solaris/bin/jexec.c
浏览文件 @
c6552bbb
/*
* Copyright (c) 1999, 201
0
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 201
2
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -80,6 +80,7 @@
# include <sys/types.h>
# include <sys/stat.h>
# include <fcntl.h>
# include "jni.h"
# include "manifest_info.h"
#endif
...
...
src/solaris/instrument/EncodingSupport_md.c
浏览文件 @
c6552bbb
...
...
@@ -33,8 +33,13 @@
/* Routines to convert back and forth between Platform Encoding and UTF-8 */
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
/* Error and assert macros */
#define UTF_ERROR(m) utfError(
__FILE__
, __LINE__, m)
#define UTF_ERROR(m) utfError(
THIS_FILE
, __LINE__, m)
#define UTF_ASSERT(x) ( (x)==0 ? UTF_ERROR("ASSERT ERROR " #x) : (void)0 )
#define UTF_DEBUG(x)
...
...
src/windows/native/com/sun/management/OperatingSystem_md.c
浏览文件 @
c6552bbb
...
...
@@ -100,18 +100,20 @@ JNIEXPORT jlong JNICALL
Java_com_sun_management_OperatingSystem_getTotalSwapSpaceSize
(
JNIEnv
*
env
,
jobject
mbean
)
{
MEMORYSTATUS
ms
;
GlobalMemoryStatus
(
&
ms
);
return
(
jlong
)
ms
.
dwTotalPageFile
;
MEMORYSTATUSEX
ms
;
ms
.
dwLength
=
sizeof
(
ms
);
GlobalMemoryStatusEx
(
&
ms
);
return
(
jlong
)
ms
.
ullTotalPageFile
;
}
JNIEXPORT
jlong
JNICALL
Java_com_sun_management_OperatingSystem_getFreeSwapSpaceSize
(
JNIEnv
*
env
,
jobject
mbean
)
{
MEMORYSTATUS
ms
;
GlobalMemoryStatus
(
&
ms
);
return
(
jlong
)
ms
.
dwAvailPageFile
;
MEMORYSTATUSEX
ms
;
ms
.
dwLength
=
sizeof
(
ms
);
GlobalMemoryStatusEx
(
&
ms
);
return
(
jlong
)
ms
.
ullAvailPageFile
;
}
JNIEXPORT
jlong
JNICALL
...
...
@@ -137,21 +139,20 @@ JNIEXPORT jlong JNICALL
Java_com_sun_management_OperatingSystem_getFreePhysicalMemorySize
(
JNIEnv
*
env
,
jobject
mbean
)
{
MEMORYSTATUS
ms
;
GlobalMemoryStatus
(
&
ms
);
return
(
jlong
)
ms
.
dwAvailPhys
;
MEMORYSTATUSEX
ms
;
ms
.
dwLength
=
sizeof
(
ms
);
GlobalMemoryStatusEx
(
&
ms
);
return
(
jlong
)
ms
.
ullAvailPhys
;
}
JNIEXPORT
jlong
JNICALL
Java_com_sun_management_OperatingSystem_getTotalPhysicalMemorySize
(
JNIEnv
*
env
,
jobject
mbean
)
{
MEMORYSTATUS
ms
;
// also returns dwAvailPhys (free physical memory bytes),
// dwTotalVirtual, dwAvailVirtual,
// dwMemoryLoad (% of memory in use)
GlobalMemoryStatus
(
&
ms
);
return
ms
.
dwTotalPhys
;
MEMORYSTATUSEX
ms
;
ms
.
dwLength
=
sizeof
(
ms
);
GlobalMemoryStatusEx
(
&
ms
);
return
(
jlong
)
ms
.
ullTotalPhys
;
}
// Seems WinXP PDH returns PDH_MORE_DATA whenever we send in a NULL buffer.
...
...
src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiIn.cpp
浏览文件 @
c6552bbb
...
...
@@ -35,9 +35,15 @@ extern "C" {
#ifdef USE_ERROR
#include <stdio.h>
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
#define MIDIIN_CHECK_ERROR { \
if (err != MMSYSERR_NOERROR) \
ERROR3("MIDI IN Error in %s:%d : %s\n",
__FILE__
, __LINE__, MIDI_IN_GetErrorStr((INT32) err)); \
ERROR3("MIDI IN Error in %s:%d : %s\n",
THIS_FILE
, __LINE__, MIDI_IN_GetErrorStr((INT32) err)); \
}
#else
#define MIDIIN_CHECK_ERROR
...
...
src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiOut.c
浏览文件 @
c6552bbb
...
...
@@ -33,9 +33,15 @@
#ifdef USE_ERROR
#include <stdio.h>
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
#define MIDIOUT_CHECK_ERROR { \
if (err != MMSYSERR_NOERROR) \
ERROR3("MIDI OUT Error in %s:%d : %s\n",
__FILE__
, __LINE__, MIDI_OUT_GetErrorStr((INT32) err)); \
ERROR3("MIDI OUT Error in %s:%d : %s\n",
THIS_FILE
, __LINE__, MIDI_OUT_GetErrorStr((INT32) err)); \
}
#else
#define MIDIOUT_CHECK_ERROR
...
...
src/windows/native/sun/java2d/d3d/D3DPipeline.h
浏览文件 @
c6552bbb
...
...
@@ -28,6 +28,11 @@
#define D3D_DEBUG_INFO
#endif // DEBUG
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE THIS_FILE
#endif
#ifdef D3D_PPL_DLL
...
...
@@ -104,7 +109,7 @@ do { \
#define ACT_IF_NULL(ACTION, value) \
if ((value) == NULL) { \
J2dTraceLn3(J2D_TRACE_ERROR, \
"%s is null in %s:%d", #value,
__FILE__
, __LINE__); \
"%s is null in %s:%d", #value,
THIS_FILE
, __LINE__); \
ACTION; \
} else do { } while (0)
#define RETURN_IF_NULL(value) ACT_IF_NULL(return, value)
...
...
@@ -114,12 +119,12 @@ do { \
#define RETURN_STATUS_IF_EXP_FAILED(EXPR) \
if (FAILED(res = (EXPR))) { \
DebugPrintD3DError(res, " " ## #EXPR ## " failed in " ##
__FILE__
); \
DebugPrintD3DError(res, " " ## #EXPR ## " failed in " ##
THIS_FILE
); \
return res; \
} else do { } while (0)
#define RETURN_STATUS_IF_FAILED(status) \
if (FAILED((status))) { \
DebugPrintD3DError((status), " failed in " ##
__FILE__
## ", return;");\
DebugPrintD3DError((status), " failed in " ##
THIS_FILE
## ", return;");\
return (status); \
} else do { } while (0)
src/windows/native/sun/windows/alloc.h
浏览文件 @
c6552bbb
...
...
@@ -26,6 +26,11 @@
#ifndef _ALLOC_H_
#define _ALLOC_H_
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
#include "stdhdrs.h"
// By defining std::bad_alloc in a local header file instead of including
...
...
@@ -127,12 +132,12 @@ void handle_bad_alloc(void);
throw
(
std
::
bad_alloc
);
#define safe_Malloc(size) \
safe_Malloc_outofmem(size,
__FILE__
, __LINE__)
safe_Malloc_outofmem(size,
THIS_FILE
, __LINE__)
#define safe_Calloc(num, size) \
safe_Calloc_outofmem(num, size,
__FILE__
, __LINE__)
safe_Calloc_outofmem(num, size,
THIS_FILE
, __LINE__)
#define safe_Realloc(memblock, size) \
safe_Realloc_outofmem(memblock, size,
__FILE__
, __LINE__)
#define new new(
__FILE__
, __LINE__)
safe_Realloc_outofmem(memblock, size,
THIS_FILE
, __LINE__)
#define new new(
THIS_FILE
, __LINE__)
#endif
/* OUTOFMEM_TEST */
#define TRY \
...
...
src/windows/native/sun/windows/awt_Debug.h
浏览文件 @
c6552bbb
...
...
@@ -65,7 +65,12 @@
#define AWT_DUMP_CLIP_RECTANGLE(_msg, _hwnd) \
_DTrace_Template(DumpClipRectangle, 2, "", (_msg), (_hwnd), 0, 0, 0, 0, 0, 0)
#define new new(__FILE__, __LINE__)
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
#define new new(THIS_FILE, __LINE__)
#define VERIFY(exp) DASSERT(exp)
#define UNIMPLEMENTED() DASSERT(FALSE)
...
...
src/windows/native/sun/windows/awt_Toolkit.h
浏览文件 @
c6552bbb
...
...
@@ -132,24 +132,30 @@ class CriticalSection {
// Macros for using CriticalSection objects that help trace
// lock/unlock actions
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
#define CRITICAL_SECTION_ENTER(cs) { \
J2dTraceLn4(J2D_TRACE_VERBOSE2, \
"CS.Wait: tid, cs, file, line = 0x%x, 0x%x, %s, %d", \
GetCurrentThreadId(), &(cs),
__FILE__
, __LINE__); \
GetCurrentThreadId(), &(cs),
THIS_FILE
, __LINE__); \
(cs).Enter(); \
J2dTraceLn4(J2D_TRACE_VERBOSE2, \
"CS.Enter: tid, cs, file, line = 0x%x, 0x%x, %s, %d", \
GetCurrentThreadId(), &(cs),
__FILE__
, __LINE__); \
GetCurrentThreadId(), &(cs),
THIS_FILE
, __LINE__); \
}
#define CRITICAL_SECTION_LEAVE(cs) { \
J2dTraceLn4(J2D_TRACE_VERBOSE2, \
"CS.Leave: tid, cs, file, line = 0x%x, 0x%x, %s, %d", \
GetCurrentThreadId(), &(cs),
__FILE__
, __LINE__); \
GetCurrentThreadId(), &(cs),
THIS_FILE
, __LINE__); \
(cs).Leave(); \
J2dTraceLn4(J2D_TRACE_VERBOSE2, \
"CS.Left: tid, cs, file, line = 0x%x, 0x%x, %s, %d", \
GetCurrentThreadId(), &(cs),
__FILE__
, __LINE__); \
GetCurrentThreadId(), &(cs),
THIS_FILE
, __LINE__); \
}
/************************************************************************
...
...
src/windows/transport/shmem/shmem_md.c
浏览文件 @
c6552bbb
...
...
@@ -30,6 +30,11 @@
#include "sysShmem.h"
#include "shmemBase.h"
/* for exitTransportWithError */
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
#define THIS_FILE __FILE__
#endif
/*
* These functions are not completely universal. For now, they are used
* exclusively for Jbug's shared memory transport mechanism. They have
...
...
@@ -44,7 +49,7 @@ static HANDLE memHandle = NULL;
if (!(expression)) { \
exitTransportWithError \
("\"%s\", line %d: assertion failure\n", \
__FILE__
, __DATE__, __LINE__); \
THIS_FILE
, __DATE__, __LINE__); \
} \
}
#else
...
...
test/ProblemList.txt
浏览文件 @
c6552bbb
...
...
@@ -261,6 +261,18 @@ java/nio/channels/AsyncCloseAndInterrupt.java solaris-all
# 7146541
java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java linux-all
# 7187882
java/rmi/activation/checkusage/CheckUsage.java generic-all
# 7190106
java/rmi/reliability/benchmark/runRmiBench.sh generic-all
# 7191877
java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java generic-all
# 7195095
sun/rmi/transport/proxy/EagerHttpFallback.java linux-all
############################################################################
# jdk_security
...
...
test/com/sun/corba/cachedSocket/7056731.sh
浏览文件 @
c6552bbb
...
...
@@ -115,5 +115,8 @@ else
exitCode
=
0
fi
#jtreg complaining about not being able to clean up; let's sleep
sleep
2
rm
-rf
out.
$$
client.
$$
sleep
2
exit
${
exitCode
}
test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
浏览文件 @
c6552bbb
/*
* Copyright (c) 2005, 20
07
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 20
12
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -23,7 +23,7 @@
/**
* @test
* @bug 6330287 6331386
* @bug 6330287 6331386
7044060
* @summary verify that DHKeyPairGenerator returns keys of the expected size
* (modulus and exponent)
* -and-
...
...
@@ -57,7 +57,8 @@ public class TestExponentSize {
* Sizes and values for various lengths.
*/
private
enum
Sizes
{
two56
(
256
),
three84
(
384
),
five12
(
512
),
seven68
(
768
),
ten24
(
1024
);
two56
(
256
),
three84
(
384
),
five12
(
512
),
seven68
(
768
),
ten24
(
1024
),
twenty48
(
2048
);
private
final
int
intSize
;
private
final
BigInteger
bigIntValue
;
...
...
@@ -82,7 +83,8 @@ public class TestExponentSize {
KeyPair
kp
;
KeyPairGenerator
kpg
=
KeyPairGenerator
.
getInstance
(
"DH"
,
"SunJCE"
);
// Sun's default uses a default psize of 1024/lsize of 512
// Sun's default uses a default psize of 1024 and
// lsize of (pSize / 2) but at least 384 bits
kp
=
kpg
.
generateKeyPair
();
checkKeyPair
(
kp
,
Sizes
.
ten24
,
Sizes
.
five12
);
...
...
@@ -114,6 +116,20 @@ public class TestExponentSize {
kp
=
kpg
.
generateKeyPair
();
checkKeyPair
(
kp
,
Sizes
.
seven68
,
Sizes
.
three84
);
// test w/ only pSize
kpg
.
initialize
(
Sizes
.
twenty48
.
getIntSize
());
kp
=
kpg
.
generateKeyPair
();
checkKeyPair
(
kp
,
Sizes
.
twenty48
,
Sizes
.
ten24
);
publicKey
=
(
DHPublicKey
)
kp
.
getPublic
();
p
=
publicKey
.
getParams
().
getP
();
g
=
publicKey
.
getParams
().
getG
();
// test w/ all values specified
kpg
.
initialize
(
new
DHParameterSpec
(
p
,
g
,
Sizes
.
five12
.
getIntSize
()));
kp
=
kpg
.
generateKeyPair
();
checkKeyPair
(
kp
,
Sizes
.
twenty48
,
Sizes
.
five12
);
System
.
out
.
println
(
"OK"
);
}
...
...
test/com/sun/management/OperatingSystemMXBean/MemoryStatusOverflow.java
0 → 100644
浏览文件 @
c6552bbb
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code 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
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 6853676
* @summary On computers with more than 4 GB of memory,
* the GlobalMemoryStatus function can return incorrect information,
* reporting a value of -1 to indicate an overflow.
*
* @run main MemoryStatusOverflow
*/
import
java.lang.reflect.Method
;
import
java.util.Arrays
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.lang.management.ManagementFactory
;
import
com.sun.management.OperatingSystemMXBean
;
public
class
MemoryStatusOverflow
{
static
final
long
MEMORYSTATUS_OVERFLOW
=
(
1L
<<
32
)
-
1
;
// (DWORD) -1
public
static
void
main
(
String
...
args
)
throws
Exception
{
OperatingSystemMXBean
bean
=
(
OperatingSystemMXBean
)
ManagementFactory
.
getOperatingSystemMXBean
();
List
<
String
>
failedGetterNames
=
new
ArrayList
<
String
>();
List
<
String
>
testedGetterNames
=
Arrays
.
asList
(
"getTotalSwapSpaceSize"
,
"getFreeSwapSpaceSize"
,
"getTotalPhysicalMemorySize"
,
"getFreePhysicalMemorySize"
);
for
(
String
getterName
:
testedGetterNames
)
{
Method
getter
=
OperatingSystemMXBean
.
class
.
getMethod
(
getterName
);
long
value
=
(
Long
)
getter
.
invoke
(
bean
);
if
(
value
==
MEMORYSTATUS_OVERFLOW
)
{
failedGetterNames
.
add
(
getterName
);
}
}
if
(!
failedGetterNames
.
isEmpty
())
{
throw
new
AssertionError
(
failedGetterNames
);
}
System
.
out
.
println
(
"Test passed."
);
}
}
test/java/nio/file/Files/CopyAndMove.java
浏览文件 @
c6552bbb
...
...
@@ -86,10 +86,12 @@ public class CopyAndMove {
assertTrue
(
attrs1
.
isSymbolicLink
()
==
attrs2
.
isSymbolicLink
());
assertTrue
(
attrs1
.
isOther
()
==
attrs2
.
isOther
());
// check last modified time
long
time1
=
attrs1
.
lastModifiedTime
().
toMillis
();
long
time2
=
attrs2
.
lastModifiedTime
().
toMillis
();
assertTrue
(
time1
==
time2
);
// check last modified time if not a symbolic link
if
(!
attrs1
.
isSymbolicLink
())
{
long
time1
=
attrs1
.
lastModifiedTime
().
toMillis
();
long
time2
=
attrs2
.
lastModifiedTime
().
toMillis
();
assertTrue
(
time1
==
time2
);
}
// check size
if
(
attrs1
.
isRegularFile
())
...
...
test/sun/security/ec/TestEC.java
浏览文件 @
c6552bbb
/*
* Copyright (c) 2009, 201
1
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 201
2
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -33,6 +33,7 @@
* @run main TestEC
*/
import
java.security.NoSuchProviderException
;
import
java.security.Provider
;
import
java.security.Security
;
...
...
@@ -62,7 +63,12 @@ public class TestEC {
}
public
static
void
main0
(
String
[]
args
)
throws
Exception
{
Provider
p
=
new
sun
.
security
.
ec
.
SunEC
();
Provider
p
=
Security
.
getProvider
(
"SunEC"
);
if
(
p
==
null
)
{
throw
new
NoSuchProviderException
(
"Can't get SunEC provider"
);
}
System
.
out
.
println
(
"Running tests with "
+
p
.
getName
()
+
" provider...\n"
);
long
start
=
System
.
currentTimeMillis
();
...
...
test/sun/security/pkcs11/ec/ReadCertificates.java
浏览文件 @
c6552bbb
...
...
@@ -63,6 +63,10 @@ public class ReadCertificates extends PKCS11Test {
System
.
out
.
println
(
"Provider does not support ECDSA, skipping..."
);
return
;
}
/*
* PKCS11Test.main will remove this provider if needed
*/
Providers
.
setAt
(
p
,
1
);
random
=
new
SecureRandom
();
...
...
@@ -132,7 +136,6 @@ public class ReadCertificates extends PKCS11Test {
}
}
Security
.
removeProvider
(
p
.
getName
());
System
.
out
.
println
(
"OK"
);
}
...
...
test/sun/security/pkcs11/ec/ReadPKCS12.java
浏览文件 @
c6552bbb
...
...
@@ -53,6 +53,10 @@ public class ReadPKCS12 extends PKCS11Test {
System
.
out
.
println
(
"Provider does not support ECDSA, skipping..."
);
return
;
}
/*
* PKCS11Test.main will remove this provider if needed
*/
Providers
.
setAt
(
p
,
1
);
CertificateFactory
factory
=
CertificateFactory
.
getInstance
(
"X.509"
);
...
...
@@ -147,7 +151,6 @@ public class ReadPKCS12 extends PKCS11Test {
out
.
close
();
}
Security
.
removeProvider
(
p
.
getName
());
System
.
out
.
println
(
"OK"
);
}
...
...
test/sun/security/pkcs11/ec/TestECDH.java
浏览文件 @
c6552bbb
...
...
@@ -60,6 +60,10 @@ public class TestECDH extends PKCS11Test {
System
.
out
.
println
(
"Provider does not support ECDH, skipping"
);
return
;
}
/*
* PKCS11Test.main will remove this provider if needed
*/
Providers
.
setAt
(
p
,
1
);
if
(
false
)
{
...
...
@@ -77,7 +81,6 @@ public class TestECDH extends PKCS11Test {
test
(
p
,
pub192a
,
priv192a
,
pub192b
,
priv192b
,
secret192
);
test
(
p
,
pub163a
,
priv163a
,
pub163b
,
priv163b
,
secret163
);
Security
.
removeProvider
(
p
.
getName
());
System
.
out
.
println
(
"OK"
);
}
...
...
test/sun/security/pkcs11/ec/TestECDH2.java
0 → 100644
浏览文件 @
c6552bbb
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code 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
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* @test
* @bug 6405536
* @summary basic test of ECDSA signatures for P-256 and P-384 from the
* example data in "Suite B Implementer's Guide to FIPS 186-3".
* @library ..
* @library ../../../../java/security/testlibrary
* @compile -XDignore.symbol.file TestECDH2.java
* @run main TestECDH2
*/
import
java.io.*
;
import
java.util.*
;
import
java.math.BigInteger
;
import
java.security.*
;
import
java.security.spec.*
;
import
java.security.interfaces.*
;
import
javax.crypto.*
;
import
sun.security.ec.NamedCurve
;
public
class
TestECDH2
extends
PKCS11Test
{
// values of the keys we use for the tests
// keypair using NIST P-256
private
final
static
String
privD256
=
"70a12c2db16845ed56ff68cfc21a472b3f04d7d6851bf6349f2d7d5b3452b38a"
;
private
final
static
String
pubX256
=
"8101ece47464a6ead70cf69a6e2bd3d88691a3262d22cba4f7635eaff26680a8"
;
private
final
static
String
pubY256
=
"d8a12ba61d599235f67d9cb4d58f1783d3ca43e78f0a5abaa624079936c0c3a9"
;
// keypair using NIST P-384
private
final
static
String
privD384
=
"c838b85253ef8dc7394fa5808a5183981c7deef5a69ba8f4f2117ffea39cfcd90e95f6cbc854abacab701d50c1f3cf24"
;
private
final
static
String
pubX384
=
"1fbac8eebd0cbf35640b39efe0808dd774debff20a2a329e91713baf7d7f3c3e81546d883730bee7e48678f857b02ca0"
;
private
final
static
String
pubY384
=
"eb213103bd68ce343365a8a4c3d4555fa385f5330203bdd76ffad1f3affb95751c132007e1b240353cb0a4cf1693bdf9"
;
private
KeyFactory
kf
=
null
;
private
KeyPairGenerator
kpg
=
null
;
private
static
void
testKeyAgreement
(
KeyPair
kpA
,
KeyPair
kpB
,
Provider
p
)
throws
Exception
{
KeyAgreement
ka1
=
KeyAgreement
.
getInstance
(
"ECDH"
,
p
);
ka1
.
init
(
kpA
.
getPrivate
());
ka1
.
doPhase
(
kpB
.
getPublic
(),
true
);
byte
[]
s1
=
ka1
.
generateSecret
();
KeyAgreement
ka2
=
KeyAgreement
.
getInstance
(
"ECDH"
,
p
);
ka2
.
init
(
kpB
.
getPrivate
());
ka2
.
doPhase
(
kpA
.
getPublic
(),
true
);
byte
[]
s2
=
ka2
.
generateSecret
();
if
(
Arrays
.
equals
(
s1
,
s2
)
==
false
)
{
System
.
out
.
println
(
"expected: "
+
toString
(
s1
));
System
.
out
.
println
(
"actual: "
+
toString
(
s2
));
throw
new
Exception
(
"Generated secrets do not match"
);
}
}
private
KeyPair
genECKeyPair
(
String
curvName
,
String
privD
,
String
pubX
,
String
pubY
)
throws
Exception
{
ECParameterSpec
ecParams
=
NamedCurve
.
getECParameterSpec
(
curvName
);
ECPrivateKeySpec
privKeySpec
=
new
ECPrivateKeySpec
(
new
BigInteger
(
privD
,
16
),
ecParams
);
ECPublicKeySpec
pubKeySpec
=
new
ECPublicKeySpec
(
new
ECPoint
(
new
BigInteger
(
pubX
,
16
),
new
BigInteger
(
pubY
,
16
)),
ecParams
);
PrivateKey
privKey
=
kf
.
generatePrivate
(
privKeySpec
);
PublicKey
pubKey
=
kf
.
generatePublic
(
pubKeySpec
);
return
new
KeyPair
(
pubKey
,
privKey
);
}
private
KeyPair
genECKeyPair
(
String
curvName
)
throws
Exception
{
ECGenParameterSpec
genParams
=
new
ECGenParameterSpec
(
curvName
);
kpg
.
initialize
(
genParams
,
null
);
return
kpg
.
generateKeyPair
();
}
public
static
void
main
(
String
[]
args
)
throws
Exception
{
main
(
new
TestECDH2
());
}
public
void
main
(
Provider
provider
)
throws
Exception
{
if
(
provider
.
getService
(
"KeyAgreement"
,
"ECDH"
)
==
null
)
{
System
.
out
.
println
(
"ECDH not supported, skipping"
);
return
;
}
kf
=
KeyFactory
.
getInstance
(
"EC"
,
provider
);
kpg
=
KeyPairGenerator
.
getInstance
(
"EC"
,
provider
);
System
.
out
.
println
(
"Testing against NIST P-256"
);
long
start
=
System
.
currentTimeMillis
();
KeyPair
kp256A
=
genECKeyPair
(
"secp256r1"
,
privD256
,
pubX256
,
pubY256
);
KeyPair
kp256B
=
genECKeyPair
(
"secp256r1"
);
testKeyAgreement
(
kp256A
,
kp256B
,
provider
);
System
.
out
.
println
(
"Testing against NIST P-384"
);
KeyPair
kp384A
=
genECKeyPair
(
"secp384r1"
,
privD384
,
pubX384
,
pubY384
);
KeyPair
kp384B
=
genECKeyPair
(
"secp384r1"
);
testKeyAgreement
(
kp384A
,
kp384B
,
provider
);
long
stop
=
System
.
currentTimeMillis
();
System
.
out
.
println
(
"All tests passed ("
+
(
stop
-
start
)
+
" ms)."
);
}
}
test/sun/security/pkcs11/ec/TestECDSA.java
浏览文件 @
c6552bbb
...
...
@@ -116,6 +116,10 @@ public class TestECDSA extends PKCS11Test {
System
.
out
.
println
(
"ECDSA not supported, skipping"
);
return
;
}
/*
* PKCS11Test.main will remove this provider if needed
*/
Providers
.
setAt
(
provider
,
1
);
if
(
false
)
{
...
...
@@ -137,7 +141,6 @@ public class TestECDSA extends PKCS11Test {
test
(
provider
,
pub521
,
priv521
,
sig521
);
test
(
provider
,
pub571
,
priv571
,
sig571
);
Security
.
removeProvider
(
provider
.
getName
());
long
stop
=
System
.
currentTimeMillis
();
System
.
out
.
println
(
"All tests passed ("
+
(
stop
-
start
)
+
" ms)."
);
}
...
...
test/sun/security/pkcs11/ec/TestECDSA2.java
0 → 100644
浏览文件 @
c6552bbb
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code 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
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* @test
* @bug 6405536
* @summary basic test of ECDSA signatures for P-256 and P-384 from the
* example data in "Suite B Implementer's Guide to FIPS 186-3".
* @library ..
* @library ../../../../java/security/testlibrary
* @compile -XDignore.symbol.file TestECDSA2.java
* @run main TestECDSA2
*/
import
java.io.*
;
import
java.util.*
;
import
java.math.BigInteger
;
import
java.security.*
;
import
java.security.spec.*
;
import
java.security.interfaces.*
;
import
sun.security.ec.NamedCurve
;
public
class
TestECDSA2
extends
PKCS11Test
{
// values of the keys we use for the tests
// keypair using NIST P-256
private
final
static
String
privD256
=
"70a12c2db16845ed56ff68cfc21a472b3f04d7d6851bf6349f2d7d5b3452b38a"
;
private
final
static
String
pubX256
=
"8101ece47464a6ead70cf69a6e2bd3d88691a3262d22cba4f7635eaff26680a8"
;
private
final
static
String
pubY256
=
"d8a12ba61d599235f67d9cb4d58f1783d3ca43e78f0a5abaa624079936c0c3a9"
;
// keypair using NIST P-384
private
final
static
String
privD384
=
"c838b85253ef8dc7394fa5808a5183981c7deef5a69ba8f4f2117ffea39cfcd90e95f6cbc854abacab701d50c1f3cf24"
;
private
final
static
String
pubX384
=
"1fbac8eebd0cbf35640b39efe0808dd774debff20a2a329e91713baf7d7f3c3e81546d883730bee7e48678f857b02ca0"
;
private
final
static
String
pubY384
=
"eb213103bd68ce343365a8a4c3d4555fa385f5330203bdd76ffad1f3affb95751c132007e1b240353cb0a4cf1693bdf9"
;
// data to be signed
private
final
static
byte
[]
data
=
"This is only a test message. It is 48 bytes long"
.
getBytes
();
private
KeyFactory
kf
=
null
;
private
static
void
testSignAndVerify
(
String
alg
,
KeyPair
kp
,
Provider
p
)
throws
Exception
{
Signature
s
=
Signature
.
getInstance
(
alg
,
p
);
s
.
initSign
(
kp
.
getPrivate
());
s
.
update
(
data
);
byte
[]
result
=
s
.
sign
();
s
.
initVerify
(
kp
.
getPublic
());
s
.
update
(
data
);
if
(!
s
.
verify
(
result
))
{
throw
new
Exception
(
"Error: Signature verification failed"
);
}
System
.
out
.
println
(
p
.
getName
()
+
": "
+
alg
+
" Passed"
);
}
private
KeyPair
genECKeyPair
(
String
curvName
,
String
privD
,
String
pubX
,
String
pubY
)
throws
Exception
{
ECParameterSpec
ecParams
=
NamedCurve
.
getECParameterSpec
(
curvName
);
ECPrivateKeySpec
privKeySpec
=
new
ECPrivateKeySpec
(
new
BigInteger
(
privD
,
16
),
ecParams
);
ECPublicKeySpec
pubKeySpec
=
new
ECPublicKeySpec
(
new
ECPoint
(
new
BigInteger
(
pubX
,
16
),
new
BigInteger
(
pubY
,
16
)),
ecParams
);
PrivateKey
privKey
=
kf
.
generatePrivate
(
privKeySpec
);
PublicKey
pubKey
=
kf
.
generatePublic
(
pubKeySpec
);
return
new
KeyPair
(
pubKey
,
privKey
);
}
public
static
void
main
(
String
[]
args
)
throws
Exception
{
main
(
new
TestECDSA2
());
}
public
void
main
(
Provider
provider
)
throws
Exception
{
boolean
testP256
=
(
provider
.
getService
(
"Signature"
,
"SHA256withECDSA"
)
!=
null
);
boolean
testP384
=
(
provider
.
getService
(
"Signature"
,
"SHA384withECDSA"
)
!=
null
);
if
(!
testP256
&&
!
testP384
)
{
System
.
out
.
println
(
"ECDSA not supported, skipping"
);
return
;
}
kf
=
KeyFactory
.
getInstance
(
"EC"
,
provider
);
long
start
=
System
.
currentTimeMillis
();
if
(
testP256
)
{
// can use secp256r1, NIST P-256, X9.62 prime256v1, or 1.2.840.10045.3.1.7
KeyPair
kp
=
genECKeyPair
(
"secp256r1"
,
privD256
,
pubX256
,
pubY256
);
testSignAndVerify
(
"SHA256withECDSA"
,
kp
,
provider
);
}
if
(
testP384
)
{
// can use secp384r1, NIST P-384, 1.3.132.0.34
KeyPair
kp
=
genECKeyPair
(
"secp384r1"
,
privD384
,
pubX384
,
pubY384
);
testSignAndVerify
(
"SHA384withECDSA"
,
kp
,
provider
);
}
long
stop
=
System
.
currentTimeMillis
();
System
.
out
.
println
(
"All tests passed ("
+
(
stop
-
start
)
+
" ms)."
);
}
}
test/sun/security/provider/DSA/TestAlgParameterGenerator.java
0 → 100644
浏览文件 @
c6552bbb
此差异已折叠。
点击以展开。
test/sun/security/provider/DSA/TestDSA2.java
0 → 100644
浏览文件 @
c6552bbb
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code 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
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 7044060
* @run main/othervm/timeout=250 TestDSA2
* @summary verify that DSA signature works using SHA and SHA-224 and SHA-256 digests.
*/
import
java.security.*
;
import
java.security.spec.*
;
import
java.security.interfaces.*
;
public
class
TestDSA2
{
// NOTE: need to explictly specify provider since the more
// preferred provider SunPKCS11 provider only supports up
// 1024 bits.
private
static
final
String
PROV
=
"SUN"
;
private
static
final
String
[]
SIG_ALGOS
=
{
"SHA1withDSA"
,
"SHA224withDSA"
,
"SHA256withDSA"
};
private
static
final
int
[]
KEYSIZES
=
{
1024
,
2048
};
public
static
void
main
(
String
[]
args
)
throws
Exception
{
boolean
[]
expectedToPass
=
{
true
,
true
,
true
};
test
(
1024
,
expectedToPass
);
boolean
[]
expectedToPass2
=
{
false
,
true
,
true
};
test
(
2048
,
expectedToPass2
);
}
private
static
void
test
(
int
keySize
,
boolean
[]
testStatus
)
throws
Exception
{
byte
[]
data
=
"1234567890"
.
getBytes
();
System
.
out
.
println
(
"Test against key size: "
+
keySize
);
KeyPairGenerator
keyGen
=
KeyPairGenerator
.
getInstance
(
"DSA"
,
PROV
);
keyGen
.
initialize
(
keySize
,
new
SecureRandom
());
KeyPair
pair
=
keyGen
.
generateKeyPair
();
if
(
testStatus
.
length
!=
SIG_ALGOS
.
length
)
{
throw
new
RuntimeException
(
"TestError: incorrect status array!"
);
}
for
(
int
i
=
0
;
i
<
SIG_ALGOS
.
length
;
i
++)
{
Signature
dsa
=
Signature
.
getInstance
(
SIG_ALGOS
[
i
],
PROV
);
try
{
dsa
.
initSign
(
pair
.
getPrivate
());
dsa
.
update
(
data
);
byte
[]
sig
=
dsa
.
sign
();
dsa
.
initVerify
(
pair
.
getPublic
());
dsa
.
update
(
data
);
boolean
verifies
=
dsa
.
verify
(
sig
);
if
(
verifies
==
testStatus
[
i
])
{
System
.
out
.
println
(
SIG_ALGOS
[
i
]
+
": Passed"
);
}
else
{
System
.
out
.
println
(
SIG_ALGOS
[
i
]
+
": should "
+
(
testStatus
[
i
]?
"pass"
:
"fail"
));
throw
new
RuntimeException
(
SIG_ALGOS
[
i
]
+
": Unexpected Test result!"
);
}
}
catch
(
Exception
ex
)
{
if
(
testStatus
[
i
])
{
ex
.
printStackTrace
();
throw
new
RuntimeException
(
SIG_ALGOS
[
i
]
+
": Unexpected exception "
+
ex
);
}
else
{
System
.
out
.
println
(
SIG_ALGOS
[
i
]
+
": Passed, expected "
+
ex
);
}
}
}
}
}
test/sun/security/provider/DSA/TestKeyPairGenerator.java
浏览文件 @
c6552bbb
此差异已折叠。
点击以展开。
test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java
浏览文件 @
c6552bbb
此差异已折叠。
点击以展开。
test/sun/tools/jstatd/jpsOutput1.awk
浏览文件 @
c6552bbb
此差异已折叠。
点击以展开。
test/tools/launcher/BigJar.java
0 → 100644
浏览文件 @
c6552bbb
此差异已折叠。
点击以展开。
test/tools/launcher/TestHelper.java
浏览文件 @
c6552bbb
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录