hg: jdk7u/jdk7u-dev/jdk: 2 new changesets

[sean.coffey at oracle.com]

Changeset: 3c95ffb5e81f
Author:    coffeys
Date:      2014-05-09 04:24 -0700
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/3c95ffb5e81f

8028192: Use of PKCS11-NSS provider in FIPS mode broken
Reviewed-by: xuelei

! src/share/classes/com/sun/crypto/provider/RSACipher.java
! src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java
! src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java
! src/share/classes/sun/security/pkcs11/P11RSACipher.java
! src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java
! src/share/classes/sun/security/pkcs11/Token.java
! src/share/classes/sun/security/ssl/RSAClientKeyExchange.java
! src/share/classes/sun/security/util/KeyUtil.java
! src/windows/classes/sun/security/mscapi/RSACipher.java
! test/com/sun/crypto/provider/TLS/TestPremaster.java
! test/sun/security/pkcs11/fips/CipherTest.java
! test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java
! test/sun/security/pkcs11/tls/TestPremaster.java

Changeset: d1538beb0d93
Author:    coffeys
Date:      2014-05-13 12:21 -0700
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/d1538beb0d93

Merge