added extra SHA1hmac oid

work with threads to avoid Java 11 issues

core/src/main/java/org/bouncycastle/asn1/misc/MiscObjectIdentifiers.java

@@ -101,6 +101,12 @@ public interface MiscObjectIdentifiers
      */
     ASN1ObjectIdentifier cast5CBC = entrust.branch("66.10");
 
+    //
+    // HMAC-SHA1       hMAC-SHA1 OBJECT IDENTIFIER ::= { iso(1) identified-organization(3)
+    //       dod(6) internet(1) security(5) mechanisms(5) 8 1 2 }
+    //
+    ASN1ObjectIdentifier hMAC_SHA1 = new ASN1ObjectIdentifier("1.3.6.1.5.5.8.1.2");
+
     //
     // Ascom
     //

prov/src/main/java/org/bouncycastle/jcajce/provider/drbg/DRBG.java

@@ -9,8 +9,6 @@
 import java.security.SecureRandom;
 import java.security.SecureRandomSpi;
 import java.security.Security;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
@@ -370,8 +368,6 @@ public Integer run()
     private static class HybridSecureRandom
         extends SecureRandom
     {
-        private final ExecutorService rngThread = Executors.newFixedThreadPool(1);
-
         private final AtomicBoolean seedAvailable = new AtomicBoolean(false);
         private final AtomicInteger samples = new AtomicInteger(0);
         private final SecureRandom baseRandom = createInitialEntropySource();
@@ -427,11 +423,6 @@ public byte[] generateSeed(int numBytes)
             return data;
         }
 
-        public void finalize()
-        {
-            rngThread.shutdown();
-        }
-
         private class SignallingEntropySource
             implements EntropySource
         {
@@ -464,7 +455,9 @@ public byte[] getEntropy()
 
                 if (!scheduled.getAndSet(true))
                 {
-                    rngThread.execute(new EntropyGatherer(byteLength));
+                    Thread gatherer = new Thread(new EntropyGatherer(byteLength));
+                    gatherer.setDaemon(true);
+                    gatherer.start();
                 }
 
                 return seed;

test/src/main/java/org/bouncycastle/test/est/ESTServerUtils.java

@@ -75,6 +75,7 @@ public void run()
                 }
             }
         });
+        t.setDaemon(true);
         t.setPriority(Thread.MIN_PRIORITY);
         t.start();
 

test/src/main/java/org/bouncycastle/test/est/HttpResponder.java

@@ -204,6 +204,7 @@ public int open(byte[] response)
         this.response = response;
         Thread t = new Thread(this);
         t.setPriority(Thread.MIN_PRIORITY);
+        t.setDaemon(true);
         t.start();
         ready.await(5, TimeUnit.SECONDS);
         return port;

tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/SSLSocketUtil.java

@@ -82,7 +82,9 @@ static void handshakeCompleted(Runnable notifyRunnable)
     {
         String name = "BCJSSE-HandshakeCompleted-" + (threadNumber.getAndIncrement() & 0x7FFFFFFF);
 
-        new Thread(notifyRunnable, name).start();
+        Thread t = new Thread(notifyRunnable, name);
+        t.setDaemon(true);
+        t.start();
     }
 
     static BCExtendedSSLSession importHandshakeSession(SSLSocket sslSocket)

tls/src/main/jdk1.9/org/bouncycastle/jsse/provider/SSLSocketUtil.java

@@ -70,7 +70,9 @@ static void handshakeCompleted(Runnable notifyRunnable)
     {
         String name = "BCJSSE-HandshakeCompleted-" + Integer.toUnsignedString(threadNumber.getAndIncrement());
 
-        new Thread(null, notifyRunnable, name, 0, false).start();
+        Thread t = new Thread(null, notifyRunnable, name, 0, false);
+        t.setDaemon(true);
+        t.start();
     }
 
     static BCExtendedSSLSession importHandshakeSession(SSLSocket sslSocket)

tls/src/test/java/org/bouncycastle/jsse/provider/test/SSLUtils.java

@@ -99,7 +99,9 @@ public void run()
             }
         };
 
-        new Thread(serverTask).start();
+        Thread t = new Thread(serverTask);
+        t.setDaemon(true);
+        t.start();
 
         try
         {

tls/src/test/java/org/bouncycastle/jsse/provider/test/TestProtocolUtil.java

@@ -6,9 +6,8 @@
 import java.net.Socket;
 import java.util.concurrent.Callable;
 
-import org.bouncycastle.util.Strings;
-
 import junit.framework.Assert;
+import org.bouncycastle.util.Strings;
 
 class TestProtocolUtil
 {
@@ -52,11 +51,13 @@ public static void runClientAndServer(BlockingCallable server, BlockingCallable
     {
         TestProtocolUtil.Task serverTask = new TestProtocolUtil.Task(server);
         Thread serverThread = new Thread(serverTask);
+        serverThread.setDaemon(true);
         serverThread.start();
         server.await();
 
         TestProtocolUtil.Task clientTask = new TestProtocolUtil.Task(client);
         Thread clientThread = new Thread(clientTask);
+        clientThread.setDaemon(true);
         clientThread.start();
         client.await();