vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Shrink try body in XmppHostnameVerifier

This commit is contained in:
Florian Schmaus 2015-06-24 10:56:02 +02:00
parent 19c797777e
commit a73dcd6f53
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
smack-java7/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java
View File

@ -78,8 +78,14 @@ public class XmppHostnameVerifier implements HostnameVerifier {
} }
catch (SSLPeerUnverifiedException e) { catch (SSLPeerUnverifiedException e) {
// Not using certificates for peers, try verifying the principal // Not using certificates for peers, try verifying the principal
Principal peerPrincipal = null;
try { try {
Principal peerPrincipal = session.getPeerPrincipal(); peerPrincipal = session.getPeerPrincipal();
}
catch (SSLPeerUnverifiedException e2) {
LOGGER.log(Level.INFO, "Can't verify principal for " + hostname + ". Not kerberos",
e2);
}
if (peerPrincipal instanceof KerberosPrincipal) { if (peerPrincipal instanceof KerberosPrincipal) {
validPrincipal = match(hostname, (KerberosPrincipal) peerPrincipal); validPrincipal = match(hostname, (KerberosPrincipal) peerPrincipal);
} }
@ -87,11 +93,6 @@ public class XmppHostnameVerifier implements HostnameVerifier {
LOGGER.info("Can't verify principal for " + hostname + ". Not kerberos"); LOGGER.info("Can't verify principal for " + hostname + ". Not kerberos");
} }
} }
catch (SSLPeerUnverifiedException e2) {
LOGGER.log(Level.INFO, "Can't verify principal for " + hostname + ". Not kerberos",
e2);
}
}
return validCertificate || validPrincipal; return validCertificate || validPrincipal;
} }