directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From plusplusjia...@apache.org
Subject directory-kerby git commit: Fix checkstyle issue: OperatorWrap: '&&' and '||' should be on a new line.
Date Wed, 19 Aug 2015 02:43:21 GMT
Repository: directory-kerby
Updated Branches:
  refs/heads/pkinit-support 71ee2a7a8 -> 28a5f2d7b


Fix checkstyle issue: OperatorWrap: '&&' and '||' should be on a new line.


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/28a5f2d7
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/28a5f2d7
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/28a5f2d7

Branch: refs/heads/pkinit-support
Commit: 28a5f2d7bf07beaf7702ec66540263e1b6851204
Parents: 71ee2a7
Author: plusplusjiajia <jiajia.li@intel.com>
Authored: Wed Aug 19 10:48:00 2015 +0800
Committer: plusplusjiajia <jiajia.li@intel.com>
Committed: Wed Aug 19 10:48:00 2015 +0800

----------------------------------------------------------------------
 .../main/java/org/apache/commons/ssl/HostnameVerifier.java   | 8 ++++----
 .../main/java/org/apache/commons/ssl/KeyStoreBuilder.java    | 6 +++---
 .../src/main/java/org/apache/commons/ssl/PKCS8Key.java       | 4 ++--
 .../src/main/java/org/apache/commons/ssl/Util.java           | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28a5f2d7/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/HostnameVerifier.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/HostnameVerifier.java
b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/HostnameVerifier.java
index 70c6f0a..a07060e 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/HostnameVerifier.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/HostnameVerifier.java
@@ -399,10 +399,10 @@ public interface HostnameVerifier extends javax.net.ssl.HostnameVerifier
{
                 // The CN better have at least two dots if it wants wildcard
                 // action.  It also can't be [*.co.uk] or [*.co.jp] or
                 // [*.org.uk], etc...
-                boolean doWildcard = cn.startsWith("*.") &&
-                                     cn.lastIndexOf('.') >= 0 &&
-                                     !isIP4Address(cn) &&
-                                     acceptableCountryWildcard(cn);
+                boolean doWildcard = cn.startsWith("*.")
+                                     && cn.lastIndexOf('.') >= 0
+                                     && !isIP4Address(cn)
+                                     && acceptableCountryWildcard(cn);
 
                 for (int i = 0; i < hosts.length; i++) {
                     final String hostName = hosts[i].trim().toLowerCase();

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28a5f2d7/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyStoreBuilder.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyStoreBuilder.java
b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyStoreBuilder.java
index 3415043..1cd839c 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyStoreBuilder.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyStoreBuilder.java
@@ -342,9 +342,9 @@ public class KeyStoreBuilder {
             PEMItem item = (PEMItem) it.next();
             byte[] derBytes = item.getDerBytes();
             String type = item.pemType.trim().toUpperCase();
-            if (type.startsWith("CERT") ||
-                type.startsWith("X509") ||
-                type.startsWith("PKCS7")) {
+            if (type.startsWith("CERT")
+                || type.startsWith("X509")
+                || type.startsWith("PKCS7")) {
                 ByteArrayInputStream in = new ByteArrayInputStream(derBytes);
                 X509Certificate c = (X509Certificate) cf.generateCertificate(in);
                 certificates.add(c);

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28a5f2d7/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/PKCS8Key.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/PKCS8Key.java
b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/PKCS8Key.java
index fbf346f..7bbcdf7 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/PKCS8Key.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/PKCS8Key.java
@@ -239,8 +239,8 @@ public class PKCS8Key {
                 String s = oid.substring("1.2.840.10040.4.".length());
                 // 1.2.840.10040.4.1 -- id-dsa
                 // 1.2.840.10040.4.3 -- id-dsa-with-sha1
-                isOkay = s.equals("1") || s.startsWith("1.") ||
-                         s.equals("3") || s.startsWith("3.");
+                isOkay = s.equals("1") || s.startsWith("1.")
+                         || s.equals("3") || s.startsWith("3.");
             }
             if (!isOkay) {
                 throw new ProbablyNotPKCS8Exception("Valid ASN.1, but not PKCS8 or OpenSSL
format.  OID=" + oid);

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28a5f2d7/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Util.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Util.java b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Util.java
index 2c628d3..1b317e8 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Util.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Util.java
@@ -117,9 +117,9 @@ public class Util {
             return false;
         }
         String s = yesString.trim().toUpperCase();
-        return "1".equals(s) || "YES".equals(s) || "TRUE".equals(s) ||
-               "ENABLE".equals(s) || "ENABLED".equals(s) || "Y".equals(s) ||
-               "ON".equals(s);
+        return "1".equals(s) || "YES".equals(s) || "TRUE".equals(s)
+               || "ENABLE".equals(s) || "ENABLED".equals(s) || "Y".equals(s)
+               || "ON".equals(s);
     }
 
     public static String trim(final String s) {


Mime
View raw message