[libxml-security-java] 01/01: Skip tests that do not finish
Andreas Tille
tille at debian.org
Sun Feb 5 14:07:25 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository libxml-security-java.
commit 6f42250872ee5ca8cc93a74c8285643c27aa0592
Author: Andreas Tille <tille at debian.org>
Date: Sun Feb 5 15:07:05 2017 +0100
Skip tests that do not finish
---
debian/changelog | 8 +
debian/patches/drop_not_finishing_test.patch | 615 +++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 624 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 97190ad..adb505b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libxml-security-java (1.5.8-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Skip tests that do not finish
+ Closes: #852930
+
+ -- Andreas Tille <tille at debian.org> Sun, 05 Feb 2017 15:04:44 +0100
+
libxml-security-java (1.5.8-1) unstable; urgency=medium
* New upstream release
diff --git a/debian/patches/drop_not_finishing_test.patch b/debian/patches/drop_not_finishing_test.patch
new file mode 100644
index 0000000..4ae6563
--- /dev/null
+++ b/debian/patches/drop_not_finishing_test.patch
@@ -0,0 +1,615 @@
+Descriptoin: Skip tests that do not finish
+Bug-Debian: https://bugs.debian.org/852930
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Sun, 05 Feb 2017 15:04:44 +0100
+
+--- a/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java
++++ /dev/null
+@@ -1,315 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements. See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership. The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License. You may obtain a copy of the License at
+- *
+- * http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing,
+- * software distributed under the License is distributed on an
+- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+- * KIND, either express or implied. See the License for the
+- * specific language governing permissions and limitations
+- * under the License.
+- */
+-package javax.xml.crypto.test.dsig;
+-
+-import java.lang.reflect.Constructor;
+-import java.security.Key;
+-import java.security.KeyPair;
+-import java.security.KeyPairGenerator;
+-import java.security.Provider;
+-import java.security.Security;
+-import java.util.Collections;
+-
+-import javax.xml.crypto.KeySelector;
+-import javax.xml.crypto.dom.DOMStructure;
+-import javax.xml.crypto.dsig.CanonicalizationMethod;
+-import javax.xml.crypto.dsig.DigestMethod;
+-import javax.xml.crypto.dsig.Reference;
+-import javax.xml.crypto.dsig.SignatureMethod;
+-import javax.xml.crypto.dsig.SignedInfo;
+-import javax.xml.crypto.dsig.XMLObject;
+-import javax.xml.crypto.dsig.XMLSignature;
+-import javax.xml.crypto.dsig.XMLSignatureFactory;
+-import javax.xml.crypto.dsig.dom.DOMSignContext;
+-import javax.xml.crypto.dsig.dom.DOMValidateContext;
+-import javax.xml.crypto.dsig.keyinfo.KeyInfo;
+-import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory;
+-import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
+-import javax.xml.crypto.test.KeySelectors;
+-import javax.xml.parsers.DocumentBuilder;
+-
+-import org.apache.xml.security.utils.XMLUtils;
+-import org.w3c.dom.Document;
+-import org.w3c.dom.Element;
+-import org.w3c.dom.Text;
+-
+-/**
+- * Test signing using all available PublicKey signing algorithms
+- */
+-public class PKSignatureAlgorithmTest extends org.junit.Assert {
+-
+- private KeySelector kvks;
+- private CanonicalizationMethod withoutComments;
+- private DigestMethod sha1;
+- private SignatureMethod rsaSha1, rsaSha224, rsaSha256, rsaSha384, rsaSha512, rsaRipemd160;
+- private SignatureMethod ecdsaSha1, ecdsaSha224, ecdsaSha256, ecdsaSha384, ecdsaSha512;
+- private XMLSignatureFactory fac;
+- private DocumentBuilder db;
+- private KeyPair rsaKeyPair, ecKeyPair;
+- private KeyInfo rsaki;
+- private boolean bouncyCastleAvailable = true;
+-
+- static {
+- Security.insertProviderAt
+- (new org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI(), 1);
+- }
+-
+- public PKSignatureAlgorithmTest() throws Exception {
+- //
+- // If the BouncyCastle provider is not installed, then try to load it
+- // via reflection.
+- //
+- if (Security.getProvider("BC") == null) {
+- Constructor<?> cons = null;
+- try {
+- Class<?> c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
+- cons = c.getConstructor(new Class[] {});
+- } catch (Exception e) {
+- //ignore
+- }
+- if (cons == null) {
+- bouncyCastleAvailable = false;
+- // BouncyCastle is not available so just return
+- return;
+- } else {
+- Provider provider = (java.security.Provider)cons.newInstance();
+- Security.insertProviderAt(provider, 2);
+- }
+- }
+-
+- db = XMLUtils.createDocumentBuilder(false);
+- // create common objects
+- fac = XMLSignatureFactory.getInstance();
+- withoutComments = fac.newCanonicalizationMethod
+- (CanonicalizationMethod.INCLUSIVE, (C14NMethodParameterSpec) null);
+-
+- // Digest Methods
+- sha1 = fac.newDigestMethod(DigestMethod.SHA1, null);
+-
+- rsaSha1 = fac.newSignatureMethod("http://www.w3.org/2000/09/xmldsig#rsa-sha1", null);
+- rsaSha224 = fac.newSignatureMethod("http://www.w3.org/2001/04/xmldsig-more#rsa-sha224", null);
+- rsaSha256 = fac.newSignatureMethod("http://www.w3.org/2001/04/xmldsig-more#rsa-sha256", null);
+- rsaSha384 = fac.newSignatureMethod("http://www.w3.org/2001/04/xmldsig-more#rsa-sha384", null);
+- rsaSha512 = fac.newSignatureMethod("http://www.w3.org/2001/04/xmldsig-more#rsa-sha512", null);
+- rsaRipemd160 = fac.newSignatureMethod("http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160", null);
+-
+- ecdsaSha1 = fac.newSignatureMethod("http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1", null);
+- ecdsaSha224 = fac.newSignatureMethod("http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224", null);
+- ecdsaSha256 = fac.newSignatureMethod("http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256", null);
+- ecdsaSha384 = fac.newSignatureMethod("http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384", null);
+- ecdsaSha512 = fac.newSignatureMethod("http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512", null);
+-
+- kvks = new KeySelectors.KeyValueKeySelector();
+-
+- rsaKeyPair = KeyPairGenerator.getInstance("RSA").genKeyPair();
+- ecKeyPair = KeyPairGenerator.getInstance("EC").genKeyPair();
+-
+- KeyInfoFactory kifac = fac.getKeyInfoFactory();
+- rsaki = kifac.newKeyInfo(Collections.singletonList
+- (kifac.newKeyValue(rsaKeyPair.getPublic())));
+- }
+-
+- @org.junit.Test
+- public void testRSA_SHA1() throws Exception {
+- if (!bouncyCastleAvailable) {
+- return;
+- }
+-
+- test_create_signature_enveloping(rsaSha1, sha1, rsaki,
+- rsaKeyPair.getPrivate(), kvks);
+- }
+-
+- @org.junit.Test
+- public void testRSA_SHA_224() throws Exception {
+- if (!bouncyCastleAvailable) {
+- return;
+- }
+-
+- test_create_signature_enveloping(rsaSha224, sha1, rsaki,
+- rsaKeyPair.getPrivate(), kvks);
+- }
+-
+- @org.junit.Test
+- public void testRSA_SHA_256() throws Exception {
+- if (!bouncyCastleAvailable) {
+- return;
+- }
+-
+- test_create_signature_enveloping(rsaSha256, sha1, rsaki,
+- rsaKeyPair.getPrivate(), kvks);
+- }
+-
+- @org.junit.Test
+- public void testRSA_SHA_384() throws Exception {
+- if (!bouncyCastleAvailable) {
+- return;
+- }
+-
+- test_create_signature_enveloping(rsaSha384, sha1, rsaki,
+- rsaKeyPair.getPrivate(), kvks);
+- }
+-
+- @org.junit.Test
+- public void testRSA_SHA_512() throws Exception {
+- if (!bouncyCastleAvailable) {
+- return;
+- }
+-
+- test_create_signature_enveloping(rsaSha512, sha1, rsaki,
+- rsaKeyPair.getPrivate(), kvks);
+- }
+-
+- @org.junit.Test
+- public void testRSA_RIPEMD160() throws Exception {
+- if (!bouncyCastleAvailable) {
+- return;
+- }
+-
+- test_create_signature_enveloping(rsaRipemd160, sha1, rsaki,
+- rsaKeyPair.getPrivate(), kvks);
+- }
+-
+- @org.junit.Test
+- public void testECDSA_SHA1() throws Exception {
+- if (!bouncyCastleAvailable) {
+- return;
+- }
+-
+- test_create_signature_enveloping(ecdsaSha1, sha1, null,
+- ecKeyPair.getPrivate(), ecKeyPair.getPublic());
+- }
+-
+- @org.junit.Test
+- public void testECDSA_SHA224() throws Exception {
+- if (!bouncyCastleAvailable) {
+- return;
+- }
+-
+- test_create_signature_enveloping(ecdsaSha224, sha1, null,
+- ecKeyPair.getPrivate(), ecKeyPair.getPublic());
+- }
+-
+- @org.junit.Test
+- public void testECDSA_SHA256() throws Exception {
+- if (!bouncyCastleAvailable) {
+- return;
+- }
+-
+- test_create_signature_enveloping(ecdsaSha256, sha1, null,
+- ecKeyPair.getPrivate(), ecKeyPair.getPublic());
+- }
+-
+- @org.junit.Test
+- public void testECDSA_SHA384() throws Exception {
+- if (!bouncyCastleAvailable) {
+- return;
+- }
+-
+- test_create_signature_enveloping(ecdsaSha384, sha1, null,
+- ecKeyPair.getPrivate(), ecKeyPair.getPublic());
+- }
+-
+- @org.junit.Test
+- public void testECDSA_SHA512() throws Exception {
+- if (!bouncyCastleAvailable) {
+- return;
+- }
+-
+- test_create_signature_enveloping(ecdsaSha512, sha1, null,
+- ecKeyPair.getPrivate(), ecKeyPair.getPublic());
+- }
+-
+- private void test_create_signature_enveloping(
+- SignatureMethod sm, DigestMethod dm, KeyInfo ki, Key signingKey, KeySelector ks
+- ) throws Exception {
+-
+- // create reference
+- Reference ref = fac.newReference("#DSig.Object_1", dm, null,
+- XMLObject.TYPE, null);
+-
+- // create SignedInfo
+- SignedInfo si = fac.newSignedInfo(withoutComments, sm,
+- Collections.singletonList(ref));
+-
+- Document doc = db.newDocument();
+- // create Objects
+- Element webElem = doc.createElementNS(null, "Web");
+- Text text = doc.createTextNode("up up and away");
+- webElem.appendChild(text);
+- XMLObject obj = fac.newXMLObject(Collections.singletonList
+- (new DOMStructure(webElem)), "DSig.Object_1", "text/xml", null);
+-
+- // create XMLSignature
+- XMLSignature sig = fac.newXMLSignature
+- (si, ki, Collections.singletonList(obj), null, null);
+-
+- DOMSignContext dsc = new DOMSignContext(signingKey, doc);
+- dsc.setDefaultNamespacePrefix("dsig");
+-
+- sig.sign(dsc);
+-
+- // XMLUtils.outputDOM(doc.getDocumentElement(), System.out);
+-
+- DOMValidateContext dvc = new DOMValidateContext
+- (ks, doc.getDocumentElement());
+- XMLSignature sig2 = fac.unmarshalXMLSignature(dvc);
+-
+- assertTrue(sig.equals(sig2));
+- assertTrue(sig2.validate(dvc));
+- }
+-
+- private void test_create_signature_enveloping(
+- SignatureMethod sm, DigestMethod dm, KeyInfo ki, Key signingKey, Key verifyingKey
+- ) throws Exception {
+-
+- // create reference
+- Reference ref = fac.newReference("#DSig.Object_1", dm, null,
+- XMLObject.TYPE, null);
+-
+- // create SignedInfo
+- SignedInfo si = fac.newSignedInfo(withoutComments, sm,
+- Collections.singletonList(ref));
+-
+- Document doc = db.newDocument();
+- // create Objects
+- Element webElem = doc.createElementNS(null, "Web");
+- Text text = doc.createTextNode("up up and away");
+- webElem.appendChild(text);
+- XMLObject obj = fac.newXMLObject(Collections.singletonList
+- (new DOMStructure(webElem)), "DSig.Object_1", "text/xml", null);
+-
+- // create XMLSignature
+- XMLSignature sig = fac.newXMLSignature
+- (si, ki, Collections.singletonList(obj), null, null);
+-
+- DOMSignContext dsc = new DOMSignContext(signingKey, doc);
+- dsc.setDefaultNamespacePrefix("dsig");
+-
+- sig.sign(dsc);
+-
+- // XMLUtils.outputDOM(doc.getDocumentElement(), System.out);
+-
+- DOMValidateContext dvc = new DOMValidateContext
+- (verifyingKey, doc.getDocumentElement());
+- XMLSignature sig2 = fac.unmarshalXMLSignature(dvc);
+-
+- assertTrue(sig.equals(sig2));
+- assertTrue(sig2.validate(dvc));
+- }
+-}
+--- a/src/test/java/org/apache/xml/security/test/signature/ECDSASignatureTest.java
++++ /dev/null
+@@ -1,289 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements. See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership. The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License. You may obtain a copy of the License at
+- *
+- * http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing,
+- * software distributed under the License is distributed on an
+- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+- * KIND, either express or implied. See the License for the
+- * specific language governing permissions and limitations
+- * under the License.
+- */
+-package org.apache.xml.security.test.signature;
+-
+-import java.io.ByteArrayInputStream;
+-import java.io.ByteArrayOutputStream;
+-import java.io.File;
+-import java.io.FileInputStream;
+-import java.io.InputStream;
+-import java.lang.reflect.Constructor;
+-import java.security.KeyStore;
+-import java.security.PrivateKey;
+-import java.security.Provider;
+-import java.security.Security;
+-import java.security.cert.X509Certificate;
+-
+-import javax.xml.xpath.XPath;
+-import javax.xml.xpath.XPathConstants;
+-import javax.xml.xpath.XPathFactory;
+-
+-import org.apache.xml.security.algorithms.SignatureAlgorithm;
+-import org.apache.xml.security.c14n.Canonicalizer;
+-import org.apache.xml.security.keys.KeyInfo;
+-import org.apache.xml.security.signature.XMLSignature;
+-import org.apache.xml.security.test.DSNamespaceContext;
+-import org.apache.xml.security.transforms.Transforms;
+-import org.apache.xml.security.utils.Constants;
+-import org.apache.xml.security.utils.XMLUtils;
+-import org.w3c.dom.Element;
+-
+-/**
+- * Tests that creates and verifies ECDSA signatures.
+- *
+- * @author Wolfgang Glas
+- */
+-public class ECDSASignatureTest extends org.junit.Assert {
+-
+- private static final String BASEDIR = System.getProperty("basedir");
+- private static final String SEP = System.getProperty("file.separator");
+- private static final String ECDSA_JKS =
+- "src/test/resources/org/apache/xml/security/samples/input/ecdsa.jks";
+- private static final String ECDSA_JKS_PASSWORD = "security";
+-
+- private KeyStore keyStore;
+-
+- private javax.xml.parsers.DocumentBuilder db;
+-
+- public ECDSASignatureTest() throws Exception {
+- //
+- // If the BouncyCastle provider is not installed, then try to load it
+- // via reflection. If it is not available, then skip this test as it is
+- // required for elliptic curves
+- //
+- if (Security.getProvider("BC") == null) {
+- Constructor<?> cons = null;
+- try {
+- Class<?> c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
+- cons = c.getConstructor(new Class[] {});
+- } catch (Exception e) {
+- //ignore
+- }
+- if (cons == null) {
+- // BouncyCastle is not available so just return
+- return;
+- } else {
+- Provider provider = (java.security.Provider)cons.newInstance(new Object[]{});
+- Security.insertProviderAt(provider, 1);
+- }
+- }
+-
+- //String id = "http://apache.org/xml/properties/dom/document-class-name";
+- //dbf.setAttribute(id, IndexedDocument.class.getName());
+-
+- db = XMLUtils.createDocumentBuilder(false);
+- org.apache.xml.security.Init.init();
+- }
+-
+- @org.junit.Test
+- public void testOne() throws Exception {
+- if (Security.getProvider("BC") == null) {
+- return;
+- }
+-
+- keyStore = KeyStore.getInstance("JKS");
+- keyStore.load(
+- new java.io.FileInputStream(ECDSA_JKS),
+- ECDSA_JKS_PASSWORD.toCharArray()
+- );
+-
+- doVerify(doSign());
+- doVerify(doSign());
+- }
+-
+- // Failing with more recent BouncyCastle libraries
+- @org.junit.Test
+- @org.junit.Ignore
+- public void testTwo() throws Exception {
+- if (Security.getProvider("BC") == null) {
+- return;
+- }
+-
+- File file =
+- makeDataFile("src/test/resources/org/apache/xml/security/samples/input/ecdsaSignature.xml");
+- InputStream is = new FileInputStream(file);
+-
+- doVerify(is);
+- }
+-
+- @org.junit.Test
+- @org.junit.Ignore
+- public void testThree() throws Exception {
+- if (Security.getProvider("BC") == null) {
+- return;
+- }
+-
+- File file = makeDataFile("src/test/resources/at/buergerkarte/testresp.xml");
+- InputStream is = new FileInputStream(file);
+-
+- doVerify(is);
+- }
+-
+- private byte[] doSign() throws Exception {
+- PrivateKey privateKey =
+- (PrivateKey)keyStore.getKey("ECDSA", ECDSA_JKS_PASSWORD.toCharArray());
+- org.w3c.dom.Document doc = db.newDocument();
+- doc.appendChild(doc.createComment(" Comment before "));
+- Element root = doc.createElementNS("", "RootElement");
+-
+- doc.appendChild(root);
+- root.appendChild(doc.createTextNode("Some simple text\n"));
+-
+- Element canonElem =
+- XMLUtils.createElementInSignatureSpace(doc, Constants._TAG_CANONICALIZATIONMETHOD);
+- canonElem.setAttributeNS(
+- null, Constants._ATT_ALGORITHM, Canonicalizer.ALGO_ID_C14N_EXCL_OMIT_COMMENTS
+- );
+-
+- SignatureAlgorithm signatureAlgorithm =
+- new SignatureAlgorithm(doc, XMLSignature.ALGO_ID_SIGNATURE_ECDSA_SHA1);
+- XMLSignature sig =
+- new XMLSignature(doc, null, signatureAlgorithm.getElement(), canonElem);
+-
+- root.appendChild(sig.getElement());
+- doc.appendChild(doc.createComment(" Comment after "));
+- Transforms transforms = new Transforms(doc);
+- transforms.addTransform(Transforms.TRANSFORM_ENVELOPED_SIGNATURE);
+- transforms.addTransform(Transforms.TRANSFORM_C14N_WITH_COMMENTS);
+- sig.addDocument("", transforms, Constants.ALGO_ID_DIGEST_SHA1);
+-
+- X509Certificate x509 = (X509Certificate)keyStore.getCertificate("ECDSA");
+- sig.addKeyInfo(x509);
+- sig.sign(privateKey);
+-
+- ByteArrayOutputStream bos = new ByteArrayOutputStream();
+-
+- XMLUtils.outputDOMc14nWithComments(doc, bos);
+- return bos.toByteArray();
+- }
+-
+- private void doVerify(byte[] signedXml) throws Exception {
+- doVerify(new ByteArrayInputStream(signedXml));
+- }
+-
+- private void doVerify(InputStream is) throws Exception {
+- org.w3c.dom.Document doc = this.db.parse(is);
+-
+- XPathFactory xpf = XPathFactory.newInstance();
+- XPath xpath = xpf.newXPath();
+- xpath.setNamespaceContext(new DSNamespaceContext());
+-
+- String expression = "//ds:Signature[1]";
+- Element sigElement =
+- (Element) xpath.evaluate(expression, doc, XPathConstants.NODE);
+- XMLSignature signature = new XMLSignature(sigElement, "");
+-
+- signature.addResourceResolver(new XPointerResourceResolver(sigElement));
+-
+- KeyInfo ki = signature.getKeyInfo();
+- if (ki == null) {
+- throw new RuntimeException("No keyinfo");
+- }
+- X509Certificate cert = signature.getKeyInfo().getX509Certificate();
+-
+- if (cert == null) {
+- throw new RuntimeException("No certificate");
+- }
+- assertTrue(signature.checkSignatureValue(cert) );
+- }
+-
+- private File makeDataFile(String relPath) {
+- if (BASEDIR != null && !"".equals(BASEDIR)) {
+- return new File(BASEDIR + SEP + relPath);
+- } else {
+- return new File(relPath);
+- }
+- }
+-
+- /**
+- * DO NOT DELETE THIS COMMENTED OUT METHOD!
+- *
+- * The reason this method is commented out is to avoid introducing explicit
+- * BouncyCastle dependencies.
+- *
+- * Create an X.509 Certificate and associated private key using the Elliptic Curve
+- * DSA algorithm, and store in a KeyStore. This method was used to generate the
+- * keystore used for this test
+- * ("src/test/resources/org/apache/xml/security/samples/input/ecdsa.jks").
+- private static void setUpKeyAndCertificate() throws Exception {
+- java.security.spec.ECGenParameterSpec ecGenParameterSpec =
+- new java.security.spec.ECGenParameterSpec("B-409");
+-
+- java.security.KeyPairGenerator kpg =
+- java.security.KeyPairGenerator.getInstance("ECDH");
+-
+- kpg.initialize(ecGenParameterSpec, new java.security.SecureRandom());
+-
+- java.security.KeyPair kp = kpg.generateKeyPair();
+-
+- org.bouncycastle.x509.X509V3CertificateGenerator certGen =
+- new org.bouncycastle.x509.X509V3CertificateGenerator();
+-
+- long now = System.currentTimeMillis();
+- certGen.setSerialNumber(java.math.BigInteger.valueOf(now));
+-
+- org.bouncycastle.jce.X509Principal subject =
+- new org.bouncycastle.jce.X509Principal(
+- "CN=XML ECDSA Signature Test,DC=apache,DC=org"
+- );
+- certGen.setIssuerDN(subject);
+- certGen.setSubjectDN(subject);
+-
+- java.util.Date from_date = new java.util.Date(now);
+- certGen.setNotBefore(from_date);
+- java.util.Calendar cal = new java.util.GregorianCalendar();
+- cal.setTime(from_date);
+- cal.add(java.util.Calendar.YEAR, 4);
+- java.util.Date to_date = cal.getTime();
+- certGen.setNotAfter(to_date);
+-
+- certGen.setPublicKey(kp.getPublic());
+- certGen.setSignatureAlgorithm("SHA1withECDSA");
+- certGen.addExtension(
+- org.bouncycastle.asn1.x509.X509Extensions.BasicConstraints,
+- true,
+- new org.bouncycastle.asn1.x509.BasicConstraints(false)
+- );
+- certGen.addExtension(
+- org.bouncycastle.asn1.x509.X509Extensions.KeyUsage,
+- true,
+- new org.bouncycastle.asn1.x509.KeyUsage(
+- org.bouncycastle.asn1.x509.KeyUsage.digitalSignature |
+- org.bouncycastle.asn1.x509.KeyUsage.keyEncipherment |
+- org.bouncycastle.asn1.x509.KeyUsage.keyCertSign |
+- org.bouncycastle.asn1.x509.KeyUsage.cRLSign
+- )
+- );
+-
+- X509Certificate x509 = certGen.generateX509Certificate(kp.getPrivate());
+-
+- KeyStore keyStore = KeyStore.getInstance("JKS");
+- keyStore.load(null, ECDSA_JKS_PASSWORD.toCharArray());
+- keyStore.setKeyEntry(
+- "ECDSA", kp.getPrivate(),
+- ECDSA_JKS_PASSWORD.toCharArray(), new java.security.cert.Certificate[]{x509}
+- );
+- keyStore.store(
+- new java.io.FileOutputStream(ECDSA_JKS), ECDSA_JKS_PASSWORD.toCharArray()
+- );
+-
+- }
+- */
+-
+-}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4d6ff5b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+drop_not_finishing_test.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxml-security-java.git
More information about the pkg-java-commits
mailing list