Merge pull request #89 from corretto/develop

Prepare for 1.3.1 release
corretto · Mar 5, 2020 · 7472f26 · 7472f26
2 parents e612563 + 2c68c43
commit 7472f26
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.3.1
+
+### Maintenance
+* Add timestamping to signed jars. [PR #85](https://github.com/corretto/amazon-corretto-crypto-provider/pull/85)
+* Create the `Janitor` in the `Loader` so that it gets a more logical and consistent `ThreadGroup`. [PR #87](https://github.com/corretto/amazon-corretto-crypto-provider/pull/87)
+* Signed with new JCE signing certificate
+
 ## 1.3.0
 
 ### Improvements

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = 'software.amazon.cryptools'
-version = '1.3.0'
+version = '1.3.1'
 
 configurations {
     jacocoAgent
@@ -128,7 +128,8 @@ task build(overwrite:true) {
                 jar: "${buildDir}/cmake/AmazonCorrettoCryptoProvider.jar",
                 destDir: "${buildDir}/lib",
                 storepass: jcecertPassword,
-                keystore: "${project.gradle.gradleUserHomeDir}/${jcecertJks}"
+                keystore: "${project.gradle.gradleUserHomeDir}/${jcecertJks}",
+                tsaurl: "http://timestamp.digicert.com"
             )
         } else {
             copy {

diff --git a/csrc/util.h b/csrc/util.h
@@ -82,7 +82,7 @@ class EC_GROUP_auto {
         group = EC_GROUP_new_by_curve_name(nid);
     }
     ~EC_GROUP_auto() {
-        EC_GROUP_clear_free(group);
+        EC_GROUP_free(group);
     }
     operator EC_GROUP*() {return group; }
     operator const EC_GROUP*() const { return group; }

diff --git a/src/com/amazon/corretto/crypto/provider/Loader.java b/src/com/amazon/corretto/crypto/provider/Loader.java
@@ -165,11 +165,16 @@ static String getProperty(String propertyName, String def) {
         } else {
             LOG.log(Level.CONFIG, "Unable to load native library", error);
         }
+
+        // Finally start up a cleaning thread if necessary
+        RESOURCE_JANITOR = new Janitor();
     }
 
     static final boolean IS_AVAILABLE;
     static final Throwable LOADING_ERROR;
 
+    static final Janitor RESOURCE_JANITOR;
+
     static void load() {
         // no-op - but we run the static block as a side effect
     }

diff --git a/src/com/amazon/corretto/crypto/provider/NativeResource.java b/src/com/amazon/corretto/crypto/provider/NativeResource.java
@@ -3,13 +3,13 @@
 
 package com.amazon.corretto.crypto.provider;
 
+import static com.amazon.corretto.crypto.provider.Loader.RESOURCE_JANITOR;
+
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.LongConsumer;
 import java.util.function.LongFunction;
 
 class NativeResource {
-    private static final Janitor RESOURCE_JANITOR = new Janitor();
-
     /**
      * For tests. Makes a best-effort attempt to awaken any sleeping cleaner threads.
      */