You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2015/08/12 04:32:41 UTC
directory-kerby git commit: Ignore the PKCS8Key#decryptPKCS8 method
length more than 200 lines.
Repository: directory-kerby
Updated Branches:
refs/heads/pkinit-support 351eb01fb -> 6819f74c1
Ignore the PKCS8Key#decryptPKCS8 method length more than 200 lines.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/6819f74c
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/6819f74c
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/6819f74c
Branch: refs/heads/pkinit-support
Commit: 6819f74c1bb01fc1d5de187b99f1ce7d921d3a85
Parents: 351eb01
Author: plusplusjiajia <ji...@intel.com>
Authored: Wed Aug 12 10:38:00 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Aug 12 10:38:00 2015 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/commons/ssl/PKCS8Key.java | 1 +
.../apache/kerby/kerberos/provider/pki/KerbyPkiLoader.java | 9 ++++++---
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/6819f74c/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 66f1228..70fc1cc 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
@@ -461,6 +461,7 @@ public class PKCS8Key {
return new DecryptResult(transformation, keySize, decryptedBytes);
}
+ @SuppressWarnings("checkstyle:methodlength")
private static DecryptResult decryptPKCS8(Asn1PkcsStructure pkcs8,
char[] password)
throws GeneralSecurityException {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/6819f74c/kerby-provider/pki-provider/src/main/java/org/apache/kerby/kerberos/provider/pki/KerbyPkiLoader.java
----------------------------------------------------------------------
diff --git a/kerby-provider/pki-provider/src/main/java/org/apache/kerby/kerberos/provider/pki/KerbyPkiLoader.java b/kerby-provider/pki-provider/src/main/java/org/apache/kerby/kerberos/provider/pki/KerbyPkiLoader.java
index 276e90b..ba1f581 100644
--- a/kerby-provider/pki-provider/src/main/java/org/apache/kerby/kerberos/provider/pki/KerbyPkiLoader.java
+++ b/kerby-provider/pki-provider/src/main/java/org/apache/kerby/kerberos/provider/pki/KerbyPkiLoader.java
@@ -23,7 +23,11 @@ import org.apache.commons.ssl.PKCS8Key;
import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.provider.PkiLoader;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
import java.security.GeneralSecurityException;
import java.security.KeyFactory;
import java.security.PrivateKey;
@@ -104,8 +108,7 @@ public class KerbyPkiLoader implements PkiLoader {
PrivateKey pk = null;
if (pkcs8.isDSA()) {
pk = KeyFactory.getInstance("DSA").generatePrivate(spec);
- }
- else if (pkcs8.isRSA()) {
+ } else if (pkcs8.isRSA()) {
pk = KeyFactory.getInstance("RSA").generatePrivate(spec);
}