1 files changed, 0 insertions, 128 deletions
diff --git a/mobile/android/services/src/main/java/org/mozilla/gecko/sync/crypto/HKDF.java b/mobile/android/services/src/main/java/org/mozilla/gecko/sync/crypto/HKDF.java
deleted file mode 100644
index 16c0d8147..000000000
--- a/mobile/android/services/src/main/java/org/mozilla/gecko/sync/crypto/HKDF.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko.sync.crypto;
-
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.NoSuchAlgorithmException;
-
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.mozilla.gecko.sync.Utils;
-
-/*
- * A standards-compliant implementation of RFC 5869
- * for HMAC-based Key Derivation Function.
- * HMAC uses HMAC SHA256 standard.
- */
-public class HKDF {
-  public static String HMAC_ALGORITHM = "hmacSHA256";
-
-  /**
-   * Used for conversion in cases in which you *know* the encoding exists.
-   */
-  public static final byte[] bytes(String in) {
-    try {
-      return in.getBytes("UTF-8");
-    } catch (java.io.UnsupportedEncodingException e) {
-      return null;
-    }
-  }
-
-  public static final int BLOCKSIZE     = 256 / 8;
-  public static final byte[] HMAC_INPUT = bytes("Sync-AES_256_CBC-HMAC256");
-
-  /*
-   * Step 1 of RFC 5869
-   * Get sha256HMAC Bytes
-   * Input: salt (message), IKM (input keyring material)
-   * Output: PRK (pseudorandom key)
-   */
-  public static byte[] hkdfExtract(byte[] salt, byte[] IKM) throws NoSuchAlgorithmException, InvalidKeyException {
-    return digestBytes(IKM, makeHMACHasher(salt));
-  }
-
-  /*
-   * Step 2 of RFC 5869.
-   * Input: PRK from step 1, info, length.
-   * Output: OKM (output keyring material).
-   */
-  public static byte[] hkdfExpand(byte[] prk, byte[] info, int len) throws NoSuchAlgorithmException, InvalidKeyException {
-    Mac hmacHasher = makeHMACHasher(prk);
-
-    byte[] T  = {};
-    byte[] Tn = {};
-
-    int iterations = (int) Math.ceil(((double)len) / (BLOCKSIZE));
-    for (int i = 0; i < iterations; i++) {
-      Tn = digestBytes(Utils.concatAll(Tn, info, Utils.hex2Byte(Integer.toHexString(i + 1))),
-                       hmacHasher);
-      T = Utils.concatAll(T, Tn);
-    }
-
-    byte[] result = new byte[len];
-    System.arraycopy(T, 0, result, 0, len);
-    return result;
-  }
-
-  /*
-   * Make HMAC key
-   * Input: key (salt)
-   * Output: Key HMAC-Key
-   */
-  public static Key makeHMACKey(byte[] key) {
-    if (key.length == 0) {
-      key = new byte[BLOCKSIZE];
-    }
-    return new SecretKeySpec(key, HMAC_ALGORITHM);
-  }
-
-  /*
-   * Make an HMAC hasher
-   * Input: Key hmacKey
-   * Ouput: An HMAC Hasher
-   */
-  public static Mac makeHMACHasher(byte[] key) throws NoSuchAlgorithmException, InvalidKeyException {
-    Mac hmacHasher = null;
-    hmacHasher = Mac.getInstance(HMAC_ALGORITHM);
-
-    // If Mac.getInstance doesn't throw NoSuchAlgorithmException, hmacHasher is
-    // non-null.
-    assert(hmacHasher != null);
-
-    hmacHasher.init(makeHMACKey(key));
-    return hmacHasher;
-  }
-
-  /*
-   * Hash bytes with given hasher
-   * Input: message to hash, HMAC hasher
-   * Output: hashed byte[].
-   */
-  public static byte[] digestBytes(byte[] message, Mac hasher) {
-    hasher.update(message);
-    byte[] ret = hasher.doFinal();
-    hasher.reset();
-    return ret;
-  }
-
-  public static byte[] derive(byte[] skm, byte[] xts, byte[] ctxInfo, int dkLen) throws InvalidKeyException, NoSuchAlgorithmException {
-    return hkdfExpand(hkdfExtract(xts, skm), ctxInfo, dkLen);
-  }
-
-  public static void deriveMany(byte[] skm, byte[] xts, byte[] ctxInfo, byte[]... keys) throws InvalidKeyException, NoSuchAlgorithmException {
-    int length = 0;
-    for (byte[] key : keys) {
-      length += key.length;
-    }
-    byte[] derived = hkdfExpand(hkdfExtract(xts, skm), ctxInfo, length);
-    int offset = 0;
-    for (byte[] key : keys) {
-      System.arraycopy(derived, offset, key, 0, key.length);
-      offset += key.length;
-    }
-  }
-}