Remove deprecation notices from KeyManager keyTemplate functions.

PiperOrigin-RevId: 509798165 Change-Id: I3f10e9a25c0ca920401a8e1a0f47662b63fc2ac1
tink-crypto · Feb 15, 2023 · 41e7486 · 41e7486
1 parent cafe434
commit 41e7486
Show file tree

Hide file tree

Showing 19 changed files with 1 addition and 148 deletions.
diff --git a/src/main/java/com/google/crypto/tink/aead/AesCtrHmacAeadKeyManager.java b/src/main/java/com/google/crypto/tink/aead/AesCtrHmacAeadKeyManager.java
@@ -163,10 +163,7 @@ public static void register(boolean newKeyAllowed) throws GeneralSecurityExcepti
    *       <li>HMAC tag size: 16 bytes
    *       <li>HMAC hash function: SHA256
    *     </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("AES128_CTR_HMAC_SHA256")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate aes128CtrHmacSha256Template() {
     return createKeyTemplate(16, 16, 32, 16, HashType.SHA256);
   }
@@ -181,10 +178,7 @@ public static final KeyTemplate aes128CtrHmacSha256Template() {
    *       <li>HMAC tag size: 32 bytes
    *       <li>HMAC hash function: SHA256
    *     </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("AES256_CTR_HMAC_SHA256")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate aes256CtrHmacSha256Template() {
     return createKeyTemplate(32, 16, 32, 32, HashType.SHA256);
   }

diff --git a/src/main/java/com/google/crypto/tink/aead/AesEaxKeyManager.java b/src/main/java/com/google/crypto/tink/aead/AesEaxKeyManager.java
@@ -137,10 +137,7 @@ public static void register(boolean newKeyAllowed) throws GeneralSecurityExcepti
    *       <li>IV size: 16 bytes
    *       <li>Prefix type: {@link KeyTemplate.OutputPrefixType#TINK}
    *     </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("AES128_EAX")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate aes128EaxTemplate() {
     return createKeyTemplate(16, 16, KeyTemplate.OutputPrefixType.TINK);
   }
@@ -153,10 +150,7 @@ public static final KeyTemplate aes128EaxTemplate() {
    *       <li>IV size: 16 bytes
    *       <li>Prefix type: {@link KeyTemplate.OutputPrefixType#RAW} (no prefix)
    *     </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("AES128_EAX_RAW")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate rawAes128EaxTemplate() {
     return createKeyTemplate(16, 16, KeyTemplate.OutputPrefixType.RAW);
   }
@@ -169,10 +163,7 @@ public static final KeyTemplate rawAes128EaxTemplate() {
    *       <li>IV size: 16 bytes
    *       <li>Prefix type: {@link KeyTemplate.OutputPrefixType#TINK}
    *     </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("AES256_EAX")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate aes256EaxTemplate() {
     return createKeyTemplate(32, 16, KeyTemplate.OutputPrefixType.TINK);
   }
@@ -185,10 +176,7 @@ public static final KeyTemplate aes256EaxTemplate() {
    *       <li>IV size: 16 bytes
    *       <li>Prefix type: {@link KeyTemplate.OutputPrefixType#RAW} (no prefix)
    *     </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("AES256_EAX_RAW")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate rawAes256EaxTemplate() {
     return createKeyTemplate(32, 16, KeyTemplate.OutputPrefixType.RAW);
   }

diff --git a/src/main/java/com/google/crypto/tink/aead/AesGcmKeyManager.java b/src/main/java/com/google/crypto/tink/aead/AesGcmKeyManager.java
@@ -147,9 +147,7 @@ public static void register(boolean newKeyAllowed) throws GeneralSecurityExcepti
    *     <p>On Android KitKat (API level 19), the {@link com.google.crypto.tink.Aead} instance
    *     generated by this key template does not support associated data. It might not work at all
    *     in older versions.
-   * @deprecated use {@code KeyTemplates.get("AES128_GCM")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate aes128GcmTemplate() {
     return createKeyTemplate(16, KeyTemplate.OutputPrefixType.TINK);
   }
@@ -166,9 +164,7 @@ public static final KeyTemplate aes128GcmTemplate() {
    *     <p>On Android KitKat (API level 19), the {@link com.google.crypto.tink.Aead} instance
    *     generated by this key template does not support associated data. It might not work at all
    *     in older versions.
-   * @deprecated use {@code KeyTemplates.get("AES128_GCM_RAW")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate rawAes128GcmTemplate() {
     return createKeyTemplate(16, KeyTemplate.OutputPrefixType.RAW);
   }
@@ -183,9 +179,7 @@ public static final KeyTemplate rawAes128GcmTemplate() {
    *     <p>On Android KitKat (API level 19), the {@link com.google.crypto.tink.Aead} instance
    *     generated by this key template does not support associated data. It might not work at all
    *     in older versions.
-   * @deprecated use {@code KeyTemplates.get("AES256_GCM")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate aes256GcmTemplate() {
     return createKeyTemplate(32, KeyTemplate.OutputPrefixType.TINK);
   }
@@ -202,9 +196,7 @@ public static final KeyTemplate aes256GcmTemplate() {
    *     <p>On Android KitKat (API level 19), the {@link com.google.crypto.tink.Aead} instance
    *     generated by this key template does not support associated data. It might not work at all
    *     in older versions.
-   * @deprecated use {@code KeyTemplates.get("AES256_GCM_RAW")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate rawAes256GcmTemplate() {
     return createKeyTemplate(32, KeyTemplate.OutputPrefixType.RAW);
   }

diff --git a/src/main/java/com/google/crypto/tink/aead/AesGcmSivKeyManager.java b/src/main/java/com/google/crypto/tink/aead/AesGcmSivKeyManager.java
@@ -161,10 +161,7 @@ public static void register(boolean newKeyAllowed) throws GeneralSecurityExcepti
    *   <li>Key size: 16 bytes
    *   <li>Prefix type: {@link KeyTemplate.OutputPrefixType#TINK}
    * </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("AES128_GCM_SIV")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate aes128GcmSivTemplate() {
     return createKeyTemplate(16, KeyTemplate.OutputPrefixType.TINK);
   }
@@ -179,10 +176,7 @@ public static final KeyTemplate aes128GcmSivTemplate() {
    * </ul>
    *
    * <p>Keys generated from this template should create ciphertexts compatible with other libraries.
-   *
-   * @deprecated use {@code KeyTemplates.get("AES128_GCM_SIV_RAW")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate rawAes128GcmSivTemplate() {
     return createKeyTemplate(16, KeyTemplate.OutputPrefixType.RAW);
   }
@@ -195,10 +189,7 @@ public static final KeyTemplate rawAes128GcmSivTemplate() {
    *   <li>Key size: 32 bytes
    *   <li>Prefix type: {@link KeyTemplate.OutputPrefixType#TINK}
    * </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("AES256_GCM_SIV")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate aes256GcmSivTemplate() {
     return createKeyTemplate(32, KeyTemplate.OutputPrefixType.TINK);
   }
@@ -213,10 +204,7 @@ public static final KeyTemplate aes256GcmSivTemplate() {
    * </ul>
    *
    * <p>Keys generated from this template should create ciphertexts compatible with other libraries.
-   *
-   * @deprecated use {@code KeyTemplates.get("AES256_GCM_SIV_RAW")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate rawAes256GcmSivTemplate() {
     return createKeyTemplate(32, KeyTemplate.OutputPrefixType.RAW);
   }

diff --git a/src/main/java/com/google/crypto/tink/aead/ChaCha20Poly1305KeyManager.java b/src/main/java/com/google/crypto/tink/aead/ChaCha20Poly1305KeyManager.java
@@ -129,9 +129,7 @@ public static void register(boolean newKeyAllowed) throws GeneralSecurityExcepti
 
   /**
    * @return a {@link KeyTemplate} that generates new instances of ChaCha20Poly1305 keys.
-   * @deprecated use {@code KeyTemplates.get("CHACHA20_POLY1305")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate chaCha20Poly1305Template() {
     return KeyTemplate.create(
         new ChaCha20Poly1305KeyManager().getKeyType(),
@@ -143,9 +141,7 @@ public static final KeyTemplate chaCha20Poly1305Template() {
    * @return a {@link KeyTemplate} that generates new instances of ChaCha20Poly1305 keys. Keys
    *     generated from this template create ciphertexts compatible with libsodium and other
    *     libraries.
-   * @deprecated use {@code KeyTemplates.get("CHACHA20_POLY1305_RAW")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate rawChaCha20Poly1305Template() {
     return KeyTemplate.create(
         new ChaCha20Poly1305KeyManager().getKeyType(),

diff --git a/src/main/java/com/google/crypto/tink/aead/XChaCha20Poly1305KeyManager.java b/src/main/java/com/google/crypto/tink/aead/XChaCha20Poly1305KeyManager.java
@@ -151,9 +151,7 @@ public static void register(boolean newKeyAllowed) throws GeneralSecurityExcepti
 
   /**
    * @return a {@link KeyTemplate} that generates new instances of XChaCha20Poly1305 keys.
-   * @deprecated use {@code KeyTemplates.get("XCHACHA20_POLY1305")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate xChaCha20Poly1305Template() {
     return KeyTemplate.create(
         new XChaCha20Poly1305KeyManager().getKeyType(),
@@ -165,9 +163,7 @@ public static final KeyTemplate xChaCha20Poly1305Template() {
    * @return a {@link KeyTemplate} that generates new instances of XChaCha20Poly1305 keys. Keys
    *     generated from this template create ciphertexts compatible with libsodium and other
    *     libraries.
-   * @deprecated use {@code KeyTemplates.get("XCHACHA20_POLY1305_RAW")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate rawXChaCha20Poly1305Template() {
     return KeyTemplate.create(
         new XChaCha20Poly1305KeyManager().getKeyType(),

diff --git a/src/main/java/com/google/crypto/tink/daead/AesSivKeyManager.java b/src/main/java/com/google/crypto/tink/daead/AesSivKeyManager.java
@@ -161,19 +161,15 @@ public static void register(boolean newKeyAllowed) throws GeneralSecurityExcepti
 
   /**
    * @return a {@code KeyTemplate} that generates new instances of AES-SIV-CMAC keys.
-   * @deprecated use {@code KeyTemplates.get("AES256_SIV")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate aes256SivTemplate() {
     return createKeyTemplate(KEY_SIZE_IN_BYTES, KeyTemplate.OutputPrefixType.TINK);
   }
 
   /**
    * @return A {@code KeyTemplate} that generates new instances of AES-SIV-CMAC keys. Keys generated
    *     from this template create ciphertexts compatible with other libraries.
-   * @deprecated use {@code KeyTemplates.get("AES256_SIV_RAW")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate rawAes256SivTemplate() {
     return createKeyTemplate(KEY_SIZE_IN_BYTES, KeyTemplate.OutputPrefixType.RAW);
   }

diff --git a/src/main/java/com/google/crypto/tink/hybrid/EciesAeadHkdfPrivateKeyManager.java b/src/main/java/com/google/crypto/tink/hybrid/EciesAeadHkdfPrivateKeyManager.java
@@ -281,9 +281,7 @@ public static void registerPair(boolean newKeyAllowed) throws GeneralSecurityExc
    *     <p>Unlike other key templates that use AES-GCM, the instances of {@link HybridDecrypt}
    *     generated by this key template has no limitation on Android KitKat (API level 19). They
    *     might not work in older versions though.
-   * @deprecated use {@code KeyTemplates.get("ECIES_P256_HKDF_HMAC_SHA256_AES128_GCM")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate eciesP256HkdfHmacSha256Aes128GcmTemplate() {
     return createKeyTemplate(
         EllipticCurveType.NIST_P256,
@@ -307,10 +305,7 @@ public static final KeyTemplate eciesP256HkdfHmacSha256Aes128GcmTemplate() {
    *     <p>Unlike other key templates that use AES-GCM, the instances of {@link HybridDecrypt}
    *     generated by this key template has no limitation on Android KitKat (API level 19). They
    *     might not work in older versions though.
-   * @deprecated use {@code
-   *     KeyTemplates.get("ECIES_P256_COMPRESSED_HKDF_HMAC_SHA256_AES128_GCM_RAW")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate rawEciesP256HkdfHmacSha256Aes128GcmCompressedTemplate() {
     return createKeyTemplate(
         EllipticCurveType.NIST_P256,
@@ -337,10 +332,7 @@ public static final KeyTemplate rawEciesP256HkdfHmacSha256Aes128GcmCompressedTem
    *       <li>EC Point Format: Uncompressed
    *       <li>Prefix type: {@link KeyTemplate.OutputPrefixType#TINK}
    *     </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("ECIES_P256_HKDF_HMAC_SHA256_AES128_CTR_HMAC_SHA256")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate eciesP256HkdfHmacSha256Aes128CtrHmacSha256Template() {
     return createKeyTemplate(
         EllipticCurveType.NIST_P256,
@@ -367,11 +359,7 @@ public static final KeyTemplate eciesP256HkdfHmacSha256Aes128CtrHmacSha256Templa
    *       <li>EC Point Format: Compressed
    *       <li>Prefix type: {@link KeyTemplate.OutputPrefixType#RAW} (no prefix)
    *     </ul>
-   *
-   * @deprecated use {@code
-   *     KeyTemplates.get("ECIES_P256_COMPRESSED_HKDF_HMAC_SHA256_AES128_CTR_HMAC_SHA256_RAW")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate
       rawEciesP256HkdfHmacSha256Aes128CtrHmacSha256CompressedTemplate() {
     return createKeyTemplate(

diff --git a/src/main/java/com/google/crypto/tink/mac/AesCmacKeyManager.java b/src/main/java/com/google/crypto/tink/mac/AesCmacKeyManager.java
@@ -182,10 +182,7 @@ public static void register(boolean newKeyAllowed) throws GeneralSecurityExcepti
    *       <li>Tag size: 16 bytes
    *       <li>Prefix type: {@link KeyTemplate.OutputPrefixType#TINK}
    *     </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("AES256_CMAC")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate aes256CmacTemplate() {
     AesCmacKeyFormat format =
         AesCmacKeyFormat.newBuilder()
@@ -206,10 +203,7 @@ public static final KeyTemplate aes256CmacTemplate() {
    *       <li>Tag size: 16 bytes
    *       <li>Prefix type: {@link KeyTemplate.OutputPrefixType#RAW} (no prefix)
    *     </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("AES256_CMAC_RAW")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate rawAes256CmacTemplate() {
     AesCmacKeyFormat format =
         AesCmacKeyFormat.newBuilder()

diff --git a/src/main/java/com/google/crypto/tink/mac/HmacKeyManager.java b/src/main/java/com/google/crypto/tink/mac/HmacKeyManager.java
@@ -253,10 +253,7 @@ public static void register(boolean newKeyAllowed) throws GeneralSecurityExcepti
    *       <li>Hash function: SHA256
    *       <li>Prefix type: {@link KeyTemplate.OutputPrefixType#TINK}
    *     </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("HMAC_SHA256_128BITTAG")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate hmacSha256HalfDigestTemplate() {
     return createTemplate(32, 16, HashType.SHA256);
   }
@@ -270,10 +267,7 @@ public static final KeyTemplate hmacSha256HalfDigestTemplate() {
    *       <li>Hash function: SHA256
    *       <li>Prefix type: {@link KeyTemplate.OutputPrefixType#TINK}
    *     </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("HMAC_SHA256_256BITTAG")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate hmacSha256Template() {
     return createTemplate(32, 32, HashType.SHA256);
   }
@@ -287,10 +281,7 @@ public static final KeyTemplate hmacSha256Template() {
    *       <li>Hash function: SHA512
    *       <li>Prefix type: {@link KeyTemplate.OutputPrefixType#TINK}
    *     </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("HMAC_SHA512_256BITTAG")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate hmacSha512HalfDigestTemplate() {
     return createTemplate(64, 32, HashType.SHA512);
   }
@@ -304,10 +295,7 @@ public static final KeyTemplate hmacSha512HalfDigestTemplate() {
    *       <li>Hash function: SHA512
    *       <li>Prefix type: {@link KeyTemplate.OutputPrefixType#TINK}
    *     </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("HMAC_SHA512_512BITTAG")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate hmacSha512Template() {
     return createTemplate(64, 64, HashType.SHA512);
   }

diff --git a/src/main/java/com/google/crypto/tink/prf/AesCmacPrfKeyManager.java b/src/main/java/com/google/crypto/tink/prf/AesCmacPrfKeyManager.java
@@ -141,18 +141,15 @@ public static void register(boolean newKeyAllowed) throws GeneralSecurityExcepti
    *   <li>Prefix type: {@link KeyTemplate.OutputPrefixType#RAW}
    * </ul>
    *
-   * .
+   *
    *
    * @return A {@link KeyTemplate} that generates new instances of AES-CMAC keys with the following
    *     parameters:
    *     <ul>
    *       <li>Key size: 32 bytes
    *       <li>Prefix type: {@link KeyTemplate.OutputPrefixType#RAW}
    *     </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("AES256_CMAC_PRF")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate aes256CmacTemplate() {
     AesCmacPrfKeyFormat format = AesCmacPrfKeyFormat.newBuilder().setKeySize(32).build();
     return KeyTemplate.create(

diff --git a/src/main/java/com/google/crypto/tink/prf/HkdfPrfKeyManager.java b/src/main/java/com/google/crypto/tink/prf/HkdfPrfKeyManager.java
@@ -184,10 +184,7 @@ public static String staticKeyType() {
    *   <li>HMAC key size: 32 bytes
    *   <li>Salt: empty
    * </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("HKDF_SHA256")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate hkdfSha256Template() {
     HkdfPrfKeyFormat format =
         HkdfPrfKeyFormat.newBuilder()

diff --git a/src/main/java/com/google/crypto/tink/prf/HmacPrfKeyManager.java b/src/main/java/com/google/crypto/tink/prf/HmacPrfKeyManager.java
@@ -200,10 +200,7 @@ public TinkFipsUtil.AlgorithmFipsCompatibility fipsStatus() {
    *   <li>Hash function: SHA256
    *   <li>Prefix type: {@link KeyTemplate.OutputPrefixType#RAW}
    * </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("HMAC_SHA256_PRF")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate hmacSha256Template() {
     return createTemplate(32, HashType.SHA256);
   }
@@ -217,10 +214,7 @@ public static final KeyTemplate hmacSha256Template() {
    *   <li>Hash function: SHA512
    *   <li>Prefix type: {@link KeyTemplate.OutputPrefixType#RAW}
    * </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("HMAC_SHA512_PRF")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate hmacSha512Template() {
     return createTemplate(64, HashType.SHA512);
   }

diff --git a/src/main/java/com/google/crypto/tink/signature/EcdsaSignKeyManager.java b/src/main/java/com/google/crypto/tink/signature/EcdsaSignKeyManager.java
@@ -271,10 +271,7 @@ public static void registerPair(boolean newKeyAllowed) throws GeneralSecurityExc
    *       <li>Signature encoding: DER (this is the encoding that Java uses).
    *       <li>Prefix type: {@link KeyTemplate.OutputPrefixType#TINK}.
    *     </ul>
-   *
-   * @deprecated use {@code KeyTemplates.get("ECDSA_P256")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate ecdsaP256Template() {
     return createKeyTemplate(
         HashType.SHA256,
@@ -294,9 +291,7 @@ public static final KeyTemplate ecdsaP256Template() {
    *     </ul>
    *     Keys generated from this template create raw signatures of exactly 64 bytes. It is
    *     compatible with JWS and most other libraries.
-   * @deprecated use {@code KeyTemplates.get("ECDSA_P256_RAW")}
    */
-  @Deprecated /* Deprecation under consideration */
   public static final KeyTemplate rawEcdsaP256Template() {
     return createKeyTemplate(
         HashType.SHA256,