change defasult key length to 2048

andamian · Jun 19, 2020 · 451208f · 451208f
1 parent 9104e04
commit 451208f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/cadc-cdp/build.gradle b/cadc-cdp/build.gradle
@@ -15,7 +15,7 @@ sourceCompatibility = 1.7
 
 group = 'org.opencadc'
 
-version = '1.2.3'
+version = '1.4'
 
 mainClassName = 'ca.nrc.cadc.cred.client.Main'
 
@@ -26,9 +26,9 @@ dependencies {
     compile 'org.bouncycastle:bcprov-jdk15on:1.46'
     compile 'javax.servlet:javax.servlet-api:3.1.+'
 
-    compile 'org.opencadc:cadc-util:[1.2.25,)'
+    compile 'org.opencadc:cadc-util:[1.3.10,)'
     compile 'org.opencadc:cadc-log:[1.1.0,)'
-    compile 'org.opencadc:cadc-registry:1.+'
+    compile 'org.opencadc:cadc-registry:[1.4,)'
 
     testCompile 'junit:junit:4.+'
 }

diff --git a/cadc-cdp/src/main/java/ca/nrc/cadc/cred/CertUtil.java b/cadc-cdp/src/main/java/ca/nrc/cadc/cred/CertUtil.java
@@ -3,7 +3,7 @@
 *******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 **************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 *
-*  (c) 2015.                            (c) 2015.
+*  (c) 2020.                            (c) 2020.
 *  Government of Canada                 Gouvernement du Canada
 *  National Research Council            Conseil national de recherches
 *  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -69,6 +69,7 @@
 
 package ca.nrc.cadc.cred;
 
+import ca.nrc.cadc.auth.X509CertificateChain;
 import java.io.IOException;
 import java.io.Writer;
 import java.math.BigInteger;
@@ -88,9 +89,7 @@
 import java.util.GregorianCalendar;
 import java.util.Random;
 import java.util.TimeZone;
-
 import javax.security.auth.x500.X500Principal;
-
 import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.DERSequence;
@@ -104,8 +103,6 @@
 import org.bouncycastle.x509.extension.AuthorityKeyIdentifierStructure;
 import org.bouncycastle.x509.extension.SubjectKeyIdentifierStructure;
 
-import ca.nrc.cadc.auth.X509CertificateChain;
-
 /**
  * Utilities for certificate operations
  */
@@ -114,7 +111,7 @@ public class CertUtil
 
     public static final String DEFAULT_SIGNATURE_ALGORITHM = "SHA256WITHRSA";
 
-    public static final int DEFAULT_KEY_LENGTH = 1024;
+    public static final int DEFAULT_KEY_LENGTH = 2048;
 
     /**
      * Method that generates an X509 proxy certificate