Don't throw when resetting an uninitialised Mac.

common/src/main/java/org/conscrypt/OpenSSLMac.java

@@ -38,6 +38,7 @@ public abstract class OpenSSLMac extends MacSpi {
      * Holds a dummy buffer for writing single bytes to the digest.
      */
     private final byte[] singleByte = new byte[1];
+    protected boolean initialized = false;
 
     private OpenSSLMac(int size) {
         this.size = size;
@@ -84,6 +85,7 @@ protected void engineInit(Key key, AlgorithmParameterSpec params) throws Invalid
         } catch (RuntimeException e) {
             throw new InvalidKeyException("invalid key", e);
         }
+        initialized = true;
     }
 
     @Override
@@ -140,6 +142,9 @@ protected byte[] engineDoFinal() {
 
     @Override
     protected void engineReset() {
+        if (!initialized) {
+            return;
+        }
         resetContext();
     }
 

common/src/test/java/org/conscrypt/MacTest.java

@@ -151,6 +151,8 @@ public void test(final Provider provider, final String algorithm) throws Excepti
                     mac = Mac.getInstance(algorithm, provider);
                     assertEquals(algorithm, mac.getAlgorithm());
                     assertEquals(provider, mac.getProvider());
+                    // It's not an error to reset an uninitialised Mac.
+                    mac.reset();
                     if (key != null) {
                         // TODO(prb) Ensure we have at least one test vector for every
                         // MAC in Conscrypt and Android.