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/11/30 04:10:00 UTC
[19/19] directory-kerby git commit: Merge from master.
Merge from master.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/9fe0fd88
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/9fe0fd88
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/9fe0fd88
Branch: refs/heads/pkinit-support
Commit: 9fe0fd885d6b9132a7f33225b6914e09e2cc677e
Parents: ae595fb 78f67dc
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Nov 30 11:15:58 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Nov 30 11:15:58 2015 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kerby/asn1/type/Asn1Any.java | 1 -
.../java/org/apache/kerby/asn1/type/Asn1CollectionType.java | 9 +++++----
.../kerberos/kerb/client/preauth/pkinit/PkinitPreauth.java | 1 -
.../kerby/kerberos/kerb/client/request/KdcRequest.java | 1 -
.../main/java/org/apache/kerby/cms/type/ContentInfo.java | 4 ++--
.../org/apache/kerby/cms/type/OtherCertificateFormat.java | 4 ++--
.../apache/kerby/cms/type/OtherRevocationInfoFormat.java | 4 ++--
.../org/apache/kerby/x500/type/AttributeTypeAndValue.java | 4 ++--
.../org/apache/kerby/x509/type/AlgorithmIdentifier.java | 4 ++--
.../src/main/java/org/apache/kerby/x509/type/OtherName.java | 4 ++--
.../org/apache/kerby/x509/type/PolicyQualifierInfo.java | 4 ++--
11 files changed, 19 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/9fe0fd88/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionType.java
----------------------------------------------------------------------
diff --cc kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionType.java
index bb4f622,72278d3..7011770
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionType.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionType.java
@@@ -177,15 -176,13 +177,16 @@@ public abstract class Asn1CollectionTyp
setFieldAs(index, new Asn1Integer(value));
}
+ protected void setFieldAsBigInteger(int index, BigInteger value) {
+ setFieldAs(index, new Asn1Integer(value));
+ }
+
- protected Asn1Type getFieldAsAny(int index) {
- Asn1Any any = getFieldAs(index, Asn1Any.class);
- if (any != null) {
- return any.getValue();
+ protected <T extends Asn1Type> T getFieldAsAny(int index, Class<T> t) {
+ Asn1Type value = fields[index];
+ if (value != null && value instanceof Asn1Any) {
+ Asn1Any any = (Asn1Any) value;
+ return any.getValueAs(t);
}
-
return null;
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/9fe0fd88/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitPreauth.java
----------------------------------------------------------------------
diff --cc kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitPreauth.java
index 5024abe,a1f2886..23954b0
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitPreauth.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitPreauth.java
@@@ -50,29 -42,10 +50,28 @@@ import org.apache.kerby.kerberos.kerb.t
import org.apache.kerby.kerberos.kerb.type.pa.pkinit.PaPkAsReq;
import org.apache.kerby.kerberos.kerb.type.pa.pkinit.PkAuthenticator;
import org.apache.kerby.kerberos.kerb.type.pa.pkinit.TrustedCertifiers;
-
+import org.apache.kerby.x509.type.AlgorithmIdentifier;
import org.apache.kerby.x509.type.SubjectPublicKeyInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.crypto.interfaces.DHPublicKey;
+import javax.crypto.spec.DHParameterSpec;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigInteger;
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+
-@SuppressWarnings("PMD")
public class PkinitPreauth extends AbstractPreauthPlugin {
+ private static final Logger LOG = LoggerFactory.getLogger(PkinitPreauth.class);
private PkinitContext pkinitContext;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/9fe0fd88/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java
----------------------------------------------------------------------