// Copyright 2021 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//      http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////

package com.google.crypto.tink;

import java.security.GeneralSecurityException;

/**
 * This class consists exclusively of static methods that load {@link KeyTemplate} objects.
 *
 * @since 1.6.0
 */
public final class KeyTemplates {

  /**
   * Returns a key template that was registered with the {@link Registry} as {@code name}.
   *
   * @throws GeneralSecurityException if cannot find key template with name {@code name} in the
   *     Registry
   * @since 1.6.0
   */
  public static KeyTemplate get(String name) throws GeneralSecurityException {
    if (!Registry.keyTemplateMap().containsKey(name)) {
      throw new GeneralSecurityException("cannot find key template: " + name);
    }
    return Registry.keyTemplateMap().get(name);
  }

  private KeyTemplates() {}
}

@@ -1228,13 +1228,29 @@
     
-if (!
+KeyTemplate result = 
 Regi
@@ -1275,25 +1275,41 @@
 p().
-containsKey(name)
+get(name);%0A    if (result == null
 ) %7B%0A
@@ -1392,17 +1392,26 @@
 );%0A    %7D
-%0A
+ else %7B%0A  
     retu
@@ -1417,44 +1417,21 @@
 urn 
-Registry.keyTemplateMap().get(name);
+result;%0A    %7D
 %0A  %7D

Fix potential TOCTOU race condition in Tink's KeyTemplates.get() function.