@@ -930,12 +930,8 @@ private static class KeyManagerImpl extends X509ExtendedKeyManager {
930
930
931
931
@ Override
932
932
public String chooseEngineClientAlias (String [] keyType , java .security .Principal [] issuers , javax .net .ssl .SSLEngine engine ) {
933
- if (internalContext == null ) {
934
- return null ;
935
- }
936
- if (internalContext .privateKey == null ) {
937
- return null ;
938
- }
933
+ if (internalContext .privateKey == null ) return null ;
934
+
939
935
for (int i = 0 ; i < keyType .length ; i ++) {
940
936
if (keyType [i ].equalsIgnoreCase (internalContext .keyAlgorithm )) {
941
937
return keyType [i ];
@@ -946,9 +942,8 @@ public String chooseEngineClientAlias(String[] keyType, java.security.Principal[
946
942
947
943
@ Override
948
944
public String chooseEngineServerAlias (String keyType , java .security .Principal [] issuers , javax .net .ssl .SSLEngine engine ) {
949
- if (internalContext == null || internalContext .privateKey == null ) {
950
- return null ;
951
- }
945
+ if (internalContext .privateKey == null ) return null ;
946
+
952
947
if (keyType .equalsIgnoreCase (internalContext .keyAlgorithm )) {
953
948
return keyType ;
954
949
}
@@ -967,9 +962,8 @@ public String chooseServerAlias(String keyType, java.security.Principal[] issuer
967
962
968
963
@ Override // c: ssl3_output_cert_chain
969
964
public java .security .cert .X509Certificate [] getCertificateChain (String alias ) {
970
- if ( internalContext == null ) return null ;
971
-
972
965
final List <java .security .cert .X509Certificate > chain ;
966
+
973
967
if ( internalContext .extraChainCert != null ) {
974
968
chain = (List ) internalContext .extraChainCert ;
975
969
}
@@ -1015,10 +1009,7 @@ public String[] getClientAliases(String keyType, java.security.Principal[] issue
1015
1009
1016
1010
@ Override
1017
1011
public java .security .PrivateKey getPrivateKey (String alias ) {
1018
- if (internalContext == null || internalContext .privateKey == null ) {
1019
- return null ;
1020
- }
1021
- return internalContext .privateKey ;
1012
+ return internalContext .privateKey ; // might be null
1022
1013
}
1023
1014
1024
1015
@ Override
@@ -1049,16 +1040,12 @@ public void checkServerTrusted(java.security.cert.X509Certificate[] chain, Strin
1049
1040
1050
1041
@ Override
1051
1042
public java .security .cert .X509Certificate [] getAcceptedIssuers () {
1052
- if ( internalContext == null ) return null ;
1053
-
1054
1043
final int size = internalContext .clientCert .size ();
1055
1044
return internalContext .clientCert .toArray ( new java .security .cert .X509Certificate [size ] );
1056
1045
}
1057
1046
1058
1047
// c: ssl_verify_cert_chain
1059
1048
private void checkTrusted (final String purpose , final X509Certificate [] chain ) throws CertificateException {
1060
- if ( internalContext == null ) throw new CertificateException ("uninitialized trust manager" );
1061
-
1062
1049
if ( chain != null && chain .length > 0 ) {
1063
1050
if ( (internalContext .verifyMode & SSL .VERIFY_PEER ) != 0 ) {
1064
1051
// verify_peer
0 commit comments