Merge pull request #613 from NordicSemiconductor/bugfix/errata-16350

Patches Errata 16350

Author: roshanrajaratnam

mesh/src/main/java/no/nordicsemi/android/mesh/MeshProvisioningHandler.java

@@ -499,7 +499,7 @@ private boolean parseProvisioneeConfirmation(final byte[] data) {
     }
 
     private void sendRandomConfirmationPDU(final UnprovisionedMeshNode node) {
-        final ProvisioningRandomConfirmationState provisioningRandomConfirmation = new ProvisioningRandomConfirmationState(node, this, mInternalTransportCallbacks, mStatusCallbacks);
+        final ProvisioningRandomConfirmationState provisioningRandomConfirmation = new ProvisioningRandomConfirmationState(node, mInternalTransportCallbacks, mStatusCallbacks);
         provisioningState = provisioningRandomConfirmation;
         provisioningRandomConfirmation.executeSend();
     }

mesh/src/main/java/no/nordicsemi/android/mesh/provisionerstates/ProvisioningConfirmationState.java

@@ -25,6 +25,7 @@
 import no.nordicsemi.android.mesh.logger.MeshLogger;
 
 import java.nio.ByteBuffer;
+import java.util.Arrays;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -83,7 +84,6 @@ public State getState() {
 
     @Override
     public void executeSend() {
-
         final byte[] provisioningConfirmationPDU = createProvisioningConfirmation();
         mStatusCallbacks.onProvisioningStateChanged(mNode, States.PROVISIONING_CONFIRMATION_SENT, provisioningConfirmationPDU);
         mInternalTransportCallbacks.sendProvisioningPdu(mNode, provisioningConfirmationPDU);
@@ -93,7 +93,9 @@ public void executeSend() {
     public boolean parseData(@NonNull final byte[] data) {
         mStatusCallbacks.onProvisioningStateChanged(mNode, States.PROVISIONING_CONFIRMATION_RECEIVED, data);
         parseProvisioneeConfirmation(data);
-        return true;
+        // Errata E16350 added an extra validation whether the received Confirmation is different
+        // than Provisioner's one.
+        return !Arrays.equals(mNode.provisioningConfirmation, mNode.provisioneeConfirmation);
     }
 
     private byte[] createProvisioningConfirmation() {
@@ -129,6 +131,7 @@ private byte[] createProvisioningConfirmation() {
         final byte[] confirmationData = buffer.array();
 
         final byte[] confirmationValue = SecureUtils.calculateCMAC(confirmationData, confirmationKey);
+        mNode.provisioningConfirmation = confirmationValue;
 
         buffer = ByteBuffer.allocate(confirmationValue.length + 2);
         buffer.put(new byte[]{MeshManagerApi.PDU_TYPE_PROVISIONING, TYPE_PROVISIONING_CONFIRMATION});

mesh/src/main/java/no/nordicsemi/android/mesh/provisionerstates/ProvisioningPublicKeyState.java

@@ -43,6 +43,7 @@
 import java.security.NoSuchProviderException;
 import java.security.PrivateKey;
 import java.security.spec.InvalidKeySpecException;
+import java.util.Arrays;
 
 import javax.crypto.KeyAgreement;
 
@@ -98,7 +99,9 @@ public boolean parseData(@NonNull final byte[] data) {
             provisioningStatusCallbacks.onProvisioningStateChanged(node, States.PROVISIONING_PUBLIC_KEY_RECEIVED, data);
         }
         generateSharedECDHSecret(data);
-        return true;
+        // Errata E16350 added an extra validation whether the received Public Key
+        // is different than Provisioner's one.
+        return !Arrays.equals(node.provisionerPublicKeyXY, node.provisioneePublicKeyXY);
     }
 
     private void generateKeyPairs() {

mesh/src/main/java/no/nordicsemi/android/mesh/provisionerstates/ProvisioningRandomConfirmationState.java

@@ -23,24 +23,21 @@
 package no.nordicsemi.android.mesh.provisionerstates;
 
 import java.nio.ByteBuffer;
-import java.util.Arrays;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
-import no.nordicsemi.android.mesh.InternalProvisioningCallbacks;
+
 import no.nordicsemi.android.mesh.InternalTransportCallbacks;
 import no.nordicsemi.android.mesh.MeshManagerApi;
 import no.nordicsemi.android.mesh.MeshProvisioningStatusCallbacks;
 import no.nordicsemi.android.mesh.logger.MeshLogger;
 import no.nordicsemi.android.mesh.utils.MeshParserUtils;
-import no.nordicsemi.android.mesh.utils.SecureUtils;
 
 public class ProvisioningRandomConfirmationState extends ProvisioningState {
 
     private final String TAG = ProvisioningRandomConfirmationState.class.getSimpleName();
     private final UnprovisionedMeshNode node;
     private final MeshProvisioningStatusCallbacks mStatusCallbacks;
-    private final InternalProvisioningCallbacks provisioningCallbacks;
     private final InternalTransportCallbacks mInternalTransportCallbacks;
 
     /**
@@ -49,16 +46,13 @@ public class ProvisioningRandomConfirmationState extends ProvisioningState {
      * @param node                          {@link UnprovisionedMeshNode} node.
      * @param internalTransportCallbacks    {@link InternalTransportCallbacks} callbacks.
      * @param provisioningStatusCallbacks   {@link MeshProvisioningStatusCallbacks} callbacks.
-     * @param internalProvisioningCallbacks {@link InternalProvisioningCallbacks} callbacks.
      */
     @RestrictTo(RestrictTo.Scope.LIBRARY)
     public ProvisioningRandomConfirmationState(@NonNull final UnprovisionedMeshNode node,
-                                               @NonNull final InternalProvisioningCallbacks internalProvisioningCallbacks,
                                                @NonNull final InternalTransportCallbacks internalTransportCallbacks,
                                                @NonNull final MeshProvisioningStatusCallbacks provisioningStatusCallbacks) {
         super();
         this.node = node;
-        this.provisioningCallbacks = internalProvisioningCallbacks;
         this.mInternalTransportCallbacks = internalTransportCallbacks;
         this.mStatusCallbacks = provisioningStatusCallbacks;
     }
@@ -79,7 +73,7 @@ public void executeSend() {
     public boolean parseData(@NonNull final byte[] data) {
         mStatusCallbacks.onProvisioningStateChanged(node, States.PROVISIONING_RANDOM_RECEIVED, data);
         parseProvisioneeRandom(data);
-        return provisioneeMatches();
+        return true;
     }
 
     private byte[] createProvisionerRandomPDU() {
@@ -92,37 +86,6 @@ private byte[] createProvisionerRandomPDU() {
         return data;
     }
 
-    private boolean provisioneeMatches() {
-        final byte[] provisioneeRandom = node.getProvisioneeRandom();
-
-        final byte[] confirmationInputs = provisioningCallbacks.generateConfirmationInputs(node.getProvisionerPublicKeyXY(),
-                node.getProvisioneePublicKeyXY());
-        MeshLogger.verbose(TAG, "Confirmation inputs: " + MeshParserUtils.bytesToHex(confirmationInputs, false));
-
-        //Generate a confirmation salt of the confirmation inputs
-        final byte[] confirmationSalt = SecureUtils.calculateSalt(confirmationInputs);
-        MeshLogger.verbose(TAG, "Confirmation salt: " + MeshParserUtils.bytesToHex(confirmationSalt, false));
-
-        final byte[] ecdhSecret = node.getSharedECDHSecret();
-
-        //Generate the confirmationKey by calculating the K1 of ECDH, confirmationSalt and ASCII value of "prck".
-        final byte[] confirmationKey = SecureUtils.calculateK1(ecdhSecret, confirmationSalt, SecureUtils.PRCK);
-        MeshLogger.verbose(TAG, "Confirmation key: " + MeshParserUtils.bytesToHex(confirmationKey, false));
-
-        //Generate authentication value from the user input pin
-        final byte[] authenticationValue = node.getAuthenticationValue();
-        MeshLogger.verbose(TAG, "Authentication value: " + MeshParserUtils.bytesToHex(authenticationValue, false));
-
-        ByteBuffer buffer = ByteBuffer.allocate(provisioneeRandom.length + authenticationValue.length);
-        buffer.put(provisioneeRandom);
-        buffer.put(authenticationValue);
-        final byte[] confirmationData = buffer.array();
-
-        final byte[] confirmationValue = SecureUtils.calculateCMAC(confirmationData, confirmationKey);
-
-        return Arrays.equals(confirmationValue, node.getProvisioneeConfirmation());
-    }
-
     private void parseProvisioneeRandom(final byte[] provisioneeRandomPDU) {
         final ByteBuffer buffer = ByteBuffer.allocate(provisioneeRandomPDU.length - 2);
         buffer.put(provisioneeRandomPDU, 2, buffer.limit());

mesh/src/main/java/no/nordicsemi/android/mesh/provisionerstates/UnprovisionedBaseMeshNode.java

@@ -48,6 +48,7 @@ abstract class UnprovisionedBaseMeshNode implements Parcelable {
     byte[] sharedECDHSecret;
     byte[] provisionerRandom;
     byte[] provisioneeConfirmation;
+    byte[] provisioningConfirmation;
     byte[] authenticationValue;
     byte[] provisioneeRandom;
     protected byte[] networkKey;