Upgrade to 1.12

perkss · Mar 16, 2024 · fa3ffef · fa3ffef
1 parent 156a5bc
commit fa3ffef
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3  15,6 @@ pom.xml.asc
 *iml
 .clj-kondo
 .lsp
 .classpath
 .project
 .settings/
diff --git a/project.clj b/project.clj
@@ -1,12  1,14 @@
-(defproject tinklj "0.1.10-SNAPSHOT"
 (defproject tinklj "0.1.12-SNAPSHOT"
   :description "A Clojure API for Google Tink Crypto Library. Offering a range of cryptographic techniques that are simple and easy to use."
   :dependencies [[org.clojure/clojure "1.10.1"]
-                 [com.google.crypto.tink/tink "1.10.0"]
                  [com.google.crypto.tink/tink "1.12.0"]
                  ;; https://mvnrepository.com/artifact/com.google.crypto.tink/tink-awskms
                  [com.google.crypto.tink/tink-awskms "1.9.1"]
                  ;; https://mvnrepository.com/artifact/com.google.crypto.tink/tink-gcpkms
-                 [com.google.crypto.tink/tink-gcpkms "1.8.0"]
-                 [com.google.http-client/google-http-client-jackson2 "1.40.1"]]
                  [com.google.crypto.tink/tink-gcpkms "1.9.0"]
                  [com.google.http-client/google-http-client-jackson2 "1.43.3"]]
   :license {:name "Apache License 2.0"
             :url "http://www.apache.org/licenses/" }
   :repositories [["clojars" {:sign-releases false}]]
   :plugins [[lein-cljfmt "0.6.4"]]
   :profiles {:kaocha {:dependencies [[lambdaisland/kaocha "0.0-389"]]}}

diff --git a/src/tinklj/keys/keyset_handle.clj b/src/tinklj/keys/keyset_handle.clj
@@ -60,10  60,6 @@
   (AeadKeyTemplates/createAesCtrHmacAeadKeyTemplate
    aes-key-size iv-size hmac-key-size tag-size hash-type))
 
-(defn create-kms-aead-key-template
-  [kms-key-uri]
-  (AeadKeyTemplates/createKmsAeadKeyTemplate kms-key-uri))
-
 (defn create-kms-envelope-aead-key-template
   [kms-key-uri key-template]
   (AeadKeyTemplates/createKmsEnvelopeAeadKeyTemplate kms-key-uri key-template))

diff --git a/test/tinklj/config_test.clj b/test/tinklj/config_test.clj
@@ -1,19  1,12 @@
 (ns tinklj.config-test
-  (:require [clojure.test :refer [deftest testing is]]
-            [tinklj.config :as sut])
-  (:import (com.google.crypto.tink KeyManager)))
-
-(defn key-manager [] (reify KeyManager
-                       (getKeyType [this] "")))
   (:require
    [clojure.test :refer [deftest is testing]]
    [tinklj.config :as sut]))
 
 (deftest init-test
   (doseq [thing [:aead :daead :mac :signature :streaming]]
     (testing (str "config with type " (name thing))
       (is (nil? (sut/register thing)))))
 
   (testing "Config without a type"
-    (is (nil? (sut/register))))
-
-  (testing "Can be provided with a custom key manager"
-    (is (nil? (sut/register (key-manager))))))
-
     (is (nil? (sut/register)))))