Mercurial > hg > icedtea9-forest > jdk
changeset 5857:9a5a3741bac9
Merge
author | mullan |
---|---|
date | Wed, 01 Aug 2012 11:08:11 -0400 |
parents | 21c590fdc8cb (diff) 38263aa28324 (current diff) |
children | 184da100cf45 b0bfa441d70f |
files | makefiles/LegacyMakefiles.gmk makefiles/OldImages.gmk makefiles/com/sun/crypto/provider/Makefile makefiles/common/Classes.gmk makefiles/common/Cscope.gmk makefiles/common/Defs-embedded.gmk makefiles/common/Defs-linux.gmk makefiles/common/Defs-macosx.gmk makefiles/common/Defs-solaris.gmk makefiles/common/Defs-windows.gmk makefiles/common/Defs.gmk makefiles/common/Demo.gmk makefiles/common/Library.gmk makefiles/common/Mapfile-vers.gmk makefiles/common/Modules.gmk makefiles/common/Program.gmk makefiles/common/Release-embedded.gmk makefiles/common/Release-macosx.gmk makefiles/common/Release.gmk makefiles/common/Rules.gmk makefiles/common/Subdirs.gmk makefiles/common/internal/Defs-corba.gmk makefiles/common/internal/Defs-jaxp.gmk makefiles/common/internal/Defs-jaxws.gmk makefiles/common/internal/Defs-langtools.gmk makefiles/common/internal/ImportComponents.gmk makefiles/common/internal/NativeCompileRules.gmk makefiles/common/internal/Resources.gmk makefiles/common/shared/Compiler-gcc.gmk makefiles/common/shared/Compiler-llvm.gmk makefiles/common/shared/Compiler-msvc.gmk makefiles/common/shared/Compiler-sun.gmk makefiles/common/shared/Defs-control.gmk makefiles/common/shared/Defs-java.gmk makefiles/common/shared/Defs-javadoc.gmk makefiles/common/shared/Defs-linux.gmk makefiles/common/shared/Defs-macosx.gmk makefiles/common/shared/Defs-solaris.gmk makefiles/common/shared/Defs-versions.gmk makefiles/common/shared/Defs-windows.gmk makefiles/common/shared/Defs.gmk makefiles/common/shared/Platform.gmk makefiles/common/shared/PrivateDefs.gmk-example makefiles/common/shared/Sanity-Settings.gmk makefiles/java/Makefile makefiles/java/invoke/Makefile makefiles/java/redist/Makefile makefiles/java/redist/sajdi/Makefile makefiles/javax/crypto/Defs-jce.gmk makefiles/javax/crypto/Makefile makefiles/javax/crypto/policy/limited/LIMITED makefiles/javax/crypto/policy/limited/default_local.policy makefiles/javax/crypto/policy/limited/exempt_local.policy makefiles/javax/crypto/policy/unlimited/UNLIMITED makefiles/javax/crypto/policy/unlimited/default_US_export.policy makefiles/javax/crypto/policy/unlimited/default_local.policy makefiles/mkdemo/Makefile makefiles/mkdemo/jni/Makefile makefiles/mkdemo/jni/Poller/Makefile makefiles/mkdemo/jvmti/Makefile makefiles/mkdemo/jvmti/README.txt makefiles/mkdemo/jvmti/hprof/Makefile makefiles/mkdemo/jvmti/mapfile-vers makefiles/mkdemo/management/README.txt makefiles/sun/jkernel/Makefile makefiles/sun/security/ec/Makefile makefiles/sun/security/pkcs11/FILES_c.gmk makefiles/sun/security/pkcs11/Makefile makefiles/sun/security/pkcs11/mapfile-vers src/share/classes/sun/nio/cs/SingleByteDecoder.java src/share/classes/sun/nio/cs/SingleByteEncoder.java src/share/classes/sun/nio/cs/ext/DoubleByteDecoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0201.java src/share/classes/sun/nio/cs/ext/JIS_X_0208.java src/share/classes/sun/nio/cs/ext/JIS_X_0208_Decoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0208_Encoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS5022X_Decoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS5022X_Encoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS932_Decoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS932_Encoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0208_Solaris_Decoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0208_Solaris_Encoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0212.java src/share/classes/sun/nio/cs/ext/JIS_X_0212_Decoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0212_Encoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0212_MS5022X_Decoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0212_MS5022X_Encoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Decoder.java src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Encoder.java src/share/classes/sun/nio/cs/ext/PCK.java src/share/classes/sun/nio/cs/ext/SJIS.java src/share/classes/sun/security/krb5/ServiceName.java test/sun/security/krb5/ServiceNameClone.java test/sun/security/mscapi/ShortRSAKey512.sh test/sun/security/mscapi/ShortRSAKey768.sh |
diffstat | 1 files changed, 7 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/security/provider/certpath/OCSPResponse.java Mon Jul 30 22:32:59 2012 +0100 +++ b/src/share/classes/sun/security/provider/certpath/OCSPResponse.java Wed Aug 01 11:08:11 2012 -0400 @@ -157,8 +157,6 @@ private final AlgorithmId sigAlgId; private final byte[] signature; private final byte[] tbsResponseData; - private final X500Principal responderName; - private final byte[] responderKey; private final byte[] responseNonce; /* @@ -195,8 +193,6 @@ sigAlgId = null; signature = null; tbsResponseData = null; - responderName = null; - responderKey = null; responseNonce = null; return; } @@ -268,15 +264,17 @@ // responderID short tag = (byte)(seq.tag & 0x1f); if (tag == NAME_TAG) { - responderName = - new X500Principal(new ByteArrayInputStream(seq.toByteArray())); if (debug != null) { + X500Principal responderName = + new X500Principal(seq.getData().toByteArray()); debug.println("OCSP Responder name: " + responderName); } - responderKey = null; } else if (tag == KEY_TAG) { - responderKey = seq.getOctetString(); - responderName = null; + if (debug != null) { + byte[] responderKey = seq.getData().getOctetString(); + debug.println("OCSP Responder key: " + + Debug.toString(responderKey)); + } } else { throw new IOException("Bad encoding in responderID element of " + "OCSP response: expected ASN.1 context specific tag 0 or 1");