From e87615a38e15b689b0bef8840f015d65c36247b8 Mon Sep 17 00:00:00 2001 From: thaidn Date: Wed, 14 Nov 2018 09:45:17 -0800 Subject: [PATCH 01/12] Switch back to latest Bazel. PiperOrigin-RevId: 221460179 GitOrigin-RevId: 0b64b34572e19a62458b323642e624dae6e53fff (cherry picked from commit c0223fbc53afe720390cb55be39679806cc4b9a5) --- kokoro/run_tests.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kokoro/run_tests.sh b/kokoro/run_tests.sh index bc15325567..acfa3617d3 100755 --- a/kokoro/run_tests.sh +++ b/kokoro/run_tests.sh @@ -52,9 +52,7 @@ readonly DISABLE_SANDBOX_ARGS if ! [ -z "${KOKORO_ROOT}" ]; then rm -f ~/.bazelrc # Install the latest version of Bazel. - # TODO(candrian): Temporarily set to 0.15.2 because 0.16.x with JDK 9 throws - # errors. Once these are fixed we can revert to latest. - use_bazel.sh 0.15.2 + use_bazel.sh latest if [[ "$PLATFORM" == 'darwin' ]]; then export DEVELOPER_DIR="/Applications/Xcode_${XCODE_VERSION}.app/Contents/Developer" export ANDROID_HOME="/Users/kbuilder/Library/Android/sdk" From ca930d33ac2c57aecc292ced2207f0e2d1390be5 Mon Sep 17 00:00:00 2001 From: Tink Team Date: Wed, 14 Nov 2018 13:22:17 -0800 Subject: [PATCH 02/12] Add missing ABSL build dependencies to tink PiperOrigin-RevId: 221498755 GitOrigin-RevId: 0de9d8cd8e5eb2bef7aecf72ec57d2e1198b4edb (cherry picked from commit 63ab7c41e88cb94b4a2efe48814a6c200ff716c3) --- cc/aead/BUILD.bazel | 1 + cc/hybrid/BUILD.bazel | 2 ++ cc/mac/BUILD.bazel | 1 + cc/signature/BUILD.bazel | 2 ++ 4 files changed, 6 insertions(+) diff --git a/cc/aead/BUILD.bazel b/cc/aead/BUILD.bazel index f43ef00dec..8a597acafc 100644 --- a/cc/aead/BUILD.bazel +++ b/cc/aead/BUILD.bazel @@ -68,6 +68,7 @@ cc_library( "//cc:registry", "//cc/util:status", "//cc/util:statusor", + "@com_google_absl//absl/base:core_headers", ], ) diff --git a/cc/hybrid/BUILD.bazel b/cc/hybrid/BUILD.bazel index 49f4cb639a..8777b26669 100644 --- a/cc/hybrid/BUILD.bazel +++ b/cc/hybrid/BUILD.bazel @@ -87,6 +87,7 @@ cc_library( "//cc:registry", "//cc/util:status", "//cc/util:statusor", + "@com_google_absl//absl/base:core_headers", ], ) @@ -121,6 +122,7 @@ cc_library( "//cc:registry", "//cc/util:status", "//cc/util:statusor", + "@com_google_absl//absl/base:core_headers", ], ) diff --git a/cc/mac/BUILD.bazel b/cc/mac/BUILD.bazel index 0586865163..115ae30b70 100644 --- a/cc/mac/BUILD.bazel +++ b/cc/mac/BUILD.bazel @@ -62,6 +62,7 @@ cc_library( "//cc:registry", "//cc/util:status", "//cc/util:statusor", + "@com_google_absl//absl/base:core_headers", ], ) diff --git a/cc/signature/BUILD.bazel b/cc/signature/BUILD.bazel index 402950a091..c5e5d7690a 100644 --- a/cc/signature/BUILD.bazel +++ b/cc/signature/BUILD.bazel @@ -36,6 +36,7 @@ cc_library( "//cc:registry", "//cc/util:status", "//cc/util:statusor", + "@com_google_absl//absl/base:core_headers", ], ) @@ -73,6 +74,7 @@ cc_library( "//cc:registry", "//cc/util:status", "//cc/util:statusor", + "@com_google_absl//absl/base:core_headers", ], ) From 8cdb052bb82d682f84ebc8640da323cd1def74bc Mon Sep 17 00:00:00 2001 From: thaidn Date: Sat, 1 Dec 2018 16:42:07 -0800 Subject: [PATCH 03/12] Making the build work with Bazel >= 0.20.0. PiperOrigin-RevId: 223663565 GitOrigin-RevId: 0fdf549d913bf6ca4e4c84e046280a98a2a18a42 (cherry picked from commit d5f75143c6d4ed4d3bf767ab7f52d96c95294a48) --- WORKSPACE | 148 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 78 insertions(+), 70 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 966e4daf63..2b50b07613 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,11 +1,15 @@ +workspace(name = "tink") + +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file") + #----------------------------------------------------------------------------- # wycheproof, for JSON test vectors #----------------------------------------------------------------------------- http_archive( name = "wycheproof", + sha256 = "b44bb0339ad149e6cdab1337445cf52440cbfc79684203a3db1c094d9ef8daea", strip_prefix = "wycheproof-f89f4c53a8845fcefcdb9f14ee9191dbe167e3e3", url = "https://github.com/google/wycheproof/archive/f89f4c53a8845fcefcdb9f14ee9191dbe167e3e3.zip", - sha256 = "b44bb0339ad149e6cdab1337445cf52440cbfc79684203a3db1c094d9ef8daea", ) #----------------------------------------------------------------------------- @@ -13,24 +17,34 @@ http_archive( #----------------------------------------------------------------------------- http_archive( name = "com_google_absl", + sha256 = "9094c76bb75bb02bafbdc7339d3a6b331bd23d76c357813ac963916f2f12ec11", strip_prefix = "abseil-cpp-6cf9c731027f4d8aebe3c60df8e64317e6870870", url = "https://github.com/abseil/abseil-cpp/archive/6cf9c731027f4d8aebe3c60df8e64317e6870870.zip", - sha256 = "9094c76bb75bb02bafbdc7339d3a6b331bd23d76c357813ac963916f2f12ec11", ) http_archive( name = "boringssl", + sha256 = "bd9b5f5c93e81831402d2620e28e49d2e8c4ac7c5f278cec7a5476b6236d4615", strip_prefix = "boringssl-bdd6c7c9d1b94f7010fb471b91bb490ccacafb98", url = "https://github.com/google/boringssl/archive/bdd6c7c9d1b94f7010fb471b91bb490ccacafb98.zip", - sha256 = "bd9b5f5c93e81831402d2620e28e49d2e8c4ac7c5f278cec7a5476b6236d4615", ) # GoogleTest/GoogleMock framework. Used by most C++ unit-tests. http_archive( name = "com_google_googletest", + sha256 = "9431adb18d26a304d864c2b05f6e5a165e73108fc89a110f5b27d65d7e51680b", strip_prefix = "googletest-61330388862cf011fa956f7f59082b9923e6be0e", url = "https://github.com/google/googletest/archive/61330388862cf011fa956f7f59082b9923e6be0e.zip", - sha256 = "9431adb18d26a304d864c2b05f6e5a165e73108fc89a110f5b27d65d7e51680b", +) + +http_archive( + name = "rapidjson", + build_file = "third_party/rapidjson.BUILD.bazel", + sha256 = "bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e", + strip_prefix = "rapidjson-1.1.0", + urls = [ + "https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz", + ], ) #----------------------------------------------------------------------------- @@ -42,9 +56,9 @@ http_archive( # This statement defines the @com_google_protobuf repo. http_archive( name = "com_google_protobuf", + sha256 = "e514c2e613dc47c062ea8df480efeec368ffbef98af0437ac00cdaadcb0d80d2", strip_prefix = "protobuf-3.6.0", urls = ["https://github.com/google/protobuf/archive/v3.6.0.zip"], - sha256 = "e514c2e613dc47c062ea8df480efeec368ffbef98af0437ac00cdaadcb0d80d2", ) # java_lite_proto_library rules implicitly depend on @@ -52,19 +66,9 @@ http_archive( # runtime (base classes and common utilities). http_archive( name = "com_google_protobuf_javalite", + sha256 = "38458deb90db61c054b708e141544c32863ab14a8747710ba3ee290d9b6dab92", strip_prefix = "protobuf-javalite", urls = ["https://github.com/google/protobuf/archive/javalite.zip"], - sha256 = "38458deb90db61c054b708e141544c32863ab14a8747710ba3ee290d9b6dab92", -) - -new_http_archive( - name = "rapidjson", - urls = [ - "https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz", - ], - sha256 = "bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e", - strip_prefix = "rapidjson-1.1.0", - build_file = "third_party/rapidjson.BUILD.bazel", ) #----------------------------------------------------------------------------- @@ -77,7 +81,7 @@ android_sdk_repository( # Tink uses features in Android Keystore that are only supported at this # level or newer. # See https://developer.android.com/training/articles/keystore.html. - api_level = 23, # M + api_level = 23, # M ) load("@bazel_tools//tools/build_defs/repo:java.bzl", "java_import_external") @@ -102,40 +106,40 @@ load("@bazel_tools//tools/build_defs/repo:java.bzl", "java_import_external") java_import_external( name = "args4j", - licenses = ["notice"], # MIT License jar_sha256 = "91ddeaba0b24adce72291c618c00bbdce1c884755f6c4dba9c5c46e871c69ed6", jar_urls = [ "https://maven.ibiblio.org/maven2/args4j/args4j/2.33/args4j-2.33.jar", "https://repo1.maven.org/maven2/args4j/args4j/2.33/args4j-2.33.jar", ], + licenses = ["notice"], # MIT License ) java_import_external( name = "com_amazonaws_aws_java_sdk_core", - licenses = ["notice"], # Apache License, Version 2.0 jar_sha256 = "be81b204f0ddf069a4c1f44f7e06971351aab725cbf85f542bd8dc8fdf50d5c9", jar_urls = [ "https://maven.ibiblio.org/maven2/com/amazonaws/aws-java-sdk-core/1.11.166/aws-java-sdk-core-1.11.166.jar", "https://repo1.maven.org/maven2/com/amazonaws/aws-java-sdk-core/1.11.166/aws-java-sdk-core-1.11.166.jar", ], + licenses = ["notice"], # Apache License, Version 2.0 deps = [ - "@commons_logging", - "@org_apache_httpcomponents_httpclient", - "@software_amazon_ion_java", "@com_fasterxml_jackson_core_jackson_databind", "@com_fasterxml_jackson_dataformat_cbor", + "@commons_logging", "@joda_time", + "@org_apache_httpcomponents_httpclient", + "@software_amazon_ion_java", ], ) java_import_external( name = "com_amazonaws_aws_java_sdk_kms", - licenses = ["notice"], # Apache License, Version 2.0 jar_sha256 = "e690e02028709196ace0eb3725f06c032242e40d187171fb4fe4cdc04cf0eec5", jar_urls = [ "https://repo1.maven.org/maven2/com/amazonaws/aws-java-sdk-kms/1.11.166/aws-java-sdk-kms-1.11.166.jar", "https://maven.ibiblio.org/maven2/com/amazonaws/aws-java-sdk-kms/1.11.166/aws-java-sdk-kms-1.11.166.jar", ], + licenses = ["notice"], # Apache License, Version 2.0 deps = [ "@com_amazonaws_aws_java_sdk_core", "@com_amazonaws_jmespath_java", @@ -144,105 +148,105 @@ java_import_external( java_import_external( name = "com_amazonaws_jmespath_java", - licenses = ["notice"], # Apache License, Version 2.0 jar_sha256 = "75e44f769a29f9d92f3dc481f38fb5ee2066fbb0c2bdd94a75f12f193962d997", jar_urls = [ "https://maven.ibiblio.org/maven2/com/amazonaws/jmespath-java/1.11.166/jmespath-java-1.11.166.jar", "https://repo1.maven.org/maven2/com/amazonaws/jmespath-java/1.11.166/jmespath-java-1.11.166.jar", ], + licenses = ["notice"], # Apache License, Version 2.0 deps = ["@com_fasterxml_jackson_core_jackson_databind"], ) java_import_external( name = "com_fasterxml_jackson_core", - licenses = ["notice"], # The Apache Software License, Version 2.0 jar_sha256 = "918c04b9f9043d51dead2192b5d94d9f065870c9f26c8defbe9c6dbc951f304f", jar_urls = [ "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.6.7/jackson-core-2.6.7.jar", "https://maven.ibiblio.org/maven2/com/fasterxml/jackson/core/jackson-core/2.6.7/jackson-core-2.6.7.jar", ], + licenses = ["notice"], # The Apache Software License, Version 2.0 ) java_import_external( name = "com_fasterxml_jackson_core_jackson_annotations", - licenses = ["notice"], # The Apache Software License, Version 2.0 jar_sha256 = "03348c047d981376cc444fc466cd80bda8d7eb0698dc6a99dd52c5aa15eff5ad", jar_urls = [ "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.6.0/jackson-annotations-2.6.0.jar", "https://maven.ibiblio.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.6.0/jackson-annotations-2.6.0.jar", ], + licenses = ["notice"], # The Apache Software License, Version 2.0 ) java_import_external( name = "com_fasterxml_jackson_core_jackson_databind", - licenses = ["notice"], # The Apache Software License, Version 2.0 jar_sha256 = "c6b6043c6880697536f4ae3b9fad09517081ea22b966f0a084fa2d0c515e0a4a", jar_urls = [ "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.6.7.1/jackson-databind-2.6.7.1.jar", "https://maven.ibiblio.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.6.7.1/jackson-databind-2.6.7.1.jar", ], + licenses = ["notice"], # The Apache Software License, Version 2.0 deps = [ - "@com_fasterxml_jackson_core_jackson_annotations", "@com_fasterxml_jackson_core", + "@com_fasterxml_jackson_core_jackson_annotations", ], ) java_import_external( name = "com_fasterxml_jackson_dataformat_cbor", - licenses = ["notice"], # The Apache Software License, Version 2.0 jar_sha256 = "956a0fb9186a796b8a6548909da1ee55004279647e261c7f540e5d49d4f199bf", jar_urls = [ "https://maven.ibiblio.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.6.7/jackson-dataformat-cbor-2.6.7.jar", "https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.6.7/jackson-dataformat-cbor-2.6.7.jar", ], + licenses = ["notice"], # The Apache Software License, Version 2.0 deps = ["@com_fasterxml_jackson_core"], ) java_import_external( name = "com_google_api_client", - licenses = ["notice"], # The Apache Software License, Version 2.0 jar_sha256 = "47c625c83a8cf97b8bbdff2acde923ff8fd3174e62aabcfc5d1b86692594ffba", jar_urls = [ "https://repo1.maven.org/maven2/com/google/api-client/google-api-client/1.22.0/google-api-client-1.22.0.jar", "https://maven.ibiblio.org/maven2/com/google/api-client/google-api-client/1.22.0/google-api-client-1.22.0.jar", ], + licenses = ["notice"], # The Apache Software License, Version 2.0 deps = [ - "@com_google_oauth_client", "@com_google_http_client_jackson2", + "@com_google_oauth_client", "@commons_codec", ], ) java_import_external( name = "com_google_apis_google_api_services_cloudkms", - licenses = ["notice"], # The Apache Software License, Version 2.0 jar_sha256 = "0a991ab42838b2eb80b9880e34c25ab8076a1472a2b485dd3c8911509327f494", jar_urls = [ "https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms/v1-rev4-1.22.0/google-api-services-cloudkms-v1-rev4-1.22.0.jar", "https://maven.ibiblio.org/maven2/com/google/apis/google-api-services-cloudkms/v1-rev4-1.22.0/google-api-services-cloudkms-v1-rev4-1.22.0.jar", ], + licenses = ["notice"], # The Apache Software License, Version 2.0 deps = ["@com_google_api_client"], ) java_import_external( name = "com_google_auto_common", - licenses = ["notice"], # Apache 2.0 jar_sha256 = "97db1709f57b91b32edacb596ef4641872f227b7d99ad90e467f0d77f5ba134a", jar_urls = [ "https://repo1.maven.org/maven2/com/google/auto/auto-common/0.8/auto-common-0.8.jar", "https://maven.ibiblio.org/maven2/com/google/auto/auto-common/0.8/auto-common-0.8.jar", ], + licenses = ["notice"], # Apache 2.0 deps = ["@com_google_guava"], ) java_import_external( name = "com_google_auto_service", - licenses = ["notice"], # Apache 2.0 jar_sha256 = "f68e20cc5aba8ad1759d2779c2b3725cc0bd9420c40e7b464a796b8ca1499e9e", jar_urls = [ "https://maven.ibiblio.org/maven2/com/google/auto/service/auto-service/1.0-rc3/auto-service-1.0-rc3.jar", "https://repo1.maven.org/maven2/com/google/auto/service/auto-service/1.0-rc3/auto-service-1.0-rc3.jar", ], + licenses = ["notice"], # Apache 2.0 deps = [ "@com_google_auto_common", "@com_google_guava", @@ -251,24 +255,24 @@ java_import_external( java_import_external( name = "com_google_auto_value", - neverlink = 1, - licenses = ["notice"], # Apache 2.0 jar_sha256 = "fd6fb139d97b427c321eb9370aeb29394e35d22d595166ca9071457448fa5660", jar_urls = [ "https://repo1.maven.org/maven2/com/google/auto/value/auto-value/1.0/auto-value-1.0.jar", "https://maven.ibiblio.org/maven2/com/google/auto/value/auto-value/1.0/auto-value-1.0.jar", ], + licenses = ["notice"], # Apache 2.0 + neverlink = 1, ) java_import_external( name = "com_google_code_findbugs_annotations", - neverlink = 1, - licenses = ["restricted"], # GNU Lesser Public License jar_sha256 = "acc0d2c06be70e9094d70cd05dffa077735c8f9d1a870eafda130b0592528200", jar_urls = [ "https://maven.ibiblio.org/maven2/com/google/code/findbugs/annotations/3.0.1u2/annotations-3.0.1u2.jar", "https://repo1.maven.org/maven2/com/google/code/findbugs/annotations/3.0.1u2/annotations-3.0.1u2.jar", ], + licenses = ["restricted"], # GNU Lesser Public License + neverlink = 1, deps = [ "@com_google_code_findbugs_jsr305", ], @@ -276,142 +280,142 @@ java_import_external( java_import_external( name = "com_google_code_findbugs_jsr305", - licenses = ["notice"], # The Apache Software License, Version 2.0 jar_sha256 = "c885ce34249682bc0236b4a7d56efcc12048e6135a5baf7a9cde8ad8cda13fcd", jar_urls = [ "https://maven.ibiblio.org/maven2/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar", "https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar", ], + licenses = ["notice"], # The Apache Software License, Version 2.0 ) java_import_external( name = "com_google_errorprone_error_prone_annotations", - licenses = ["notice"], # Apache 2.0 jar_sha256 = "cde78ace21e46398299d0d9c6be9f47b7f971c7f045d40c78f95be9a638cbf7e", jar_urls = [ "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.0.19/error_prone_annotations-2.0.19.jar", "https://maven.ibiblio.org/maven2/com/google/errorprone/error_prone_annotations/2.0.19/error_prone_annotations-2.0.19.jar", ], + licenses = ["notice"], # Apache 2.0 ) java_import_external( name = "com_google_guava", - licenses = ["notice"], # The Apache Software License, Version 2.0 jar_sha256 = "36a666e3b71ae7f0f0dca23654b67e086e6c93d192f60ba5dfd5519db6c288c8", jar_urls = [ "https://maven.ibiblio.org/maven2/com/google/guava/guava/20.0/guava-20.0.jar", "https://repo1.maven.org/maven2/com/google/guava/guava/20.0/guava-20.0.jar", ], + licenses = ["notice"], # The Apache Software License, Version 2.0 ) java_import_external( name = "com_google_http_client", - licenses = ["notice"], # The Apache Software License, Version 2.0 jar_sha256 = "f88ffa329ac52fb4f2ff0eb877ef7318423ac9b791a107f886ed5c7a00e77e11", jar_urls = [ "https://repo1.maven.org/maven2/com/google/http-client/google-http-client/1.22.0/google-http-client-1.22.0.jar", "https://maven.ibiblio.org/maven2/com/google/http-client/google-http-client/1.22.0/google-http-client-1.22.0.jar", ], + licenses = ["notice"], # The Apache Software License, Version 2.0 deps = [ "@com_google_code_findbugs_jsr305", - "@org_apache_httpcomponents_httpclient", "@commons_codec", + "@org_apache_httpcomponents_httpclient", ], ) java_import_external( name = "com_google_http_client_jackson2", - licenses = ["notice"], # The Apache Software License, Version 2.0 jar_sha256 = "45b1e34b2dcef5cb496ef25a1223d19cf102b8c2ea4abf96491631b2faf4611c", jar_urls = [ "https://maven.ibiblio.org/maven2/com/google/http-client/google-http-client-jackson2/1.22.0/google-http-client-jackson2-1.22.0.jar", "https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2/1.22.0/google-http-client-jackson2-1.22.0.jar", ], + licenses = ["notice"], # The Apache Software License, Version 2.0 deps = [ - "@com_google_http_client", "@com_fasterxml_jackson_core", + "@com_google_http_client", ], ) java_import_external( name = "com_google_oauth_client", - licenses = ["notice"], # The Apache Software License, Version 2.0 jar_sha256 = "a4c56168b3e042105d68cf136e40e74f6e27f63ed0a948df966b332678e19022", jar_urls = [ "https://maven.ibiblio.org/maven2/com/google/oauth-client/google-oauth-client/1.22.0/google-oauth-client-1.22.0.jar", "https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client/1.22.0/google-oauth-client-1.22.0.jar", ], + licenses = ["notice"], # The Apache Software License, Version 2.0 deps = [ - "@com_google_http_client", "@com_google_code_findbugs_jsr305", + "@com_google_http_client", ], ) java_import_external( name = "com_google_truth", - licenses = ["notice"], # The Apache Software License, Version 2.0 jar_sha256 = "032eddc69652b0a1f8d458f999b4a9534965c646b8b5de0eba48ee69407051df", jar_urls = [ "https://repo1.maven.org/maven2/com/google/truth/truth/0.32/truth-0.32.jar", "https://maven.ibiblio.org/maven2/com/google/truth/truth/0.32/truth-0.32.jar", ], + licenses = ["notice"], # The Apache Software License, Version 2.0 deps = [ - "@com_google_guava", - "@junit", "@com_google_auto_value", "@com_google_errorprone_error_prone_annotations", + "@com_google_guava", + "@junit", ], ) java_import_external( name = "commons_codec", - licenses = ["notice"], # The Apache Software License, Version 2.0 jar_sha256 = "ad19d2601c3abf0b946b5c3a4113e226a8c1e3305e395b90013b78dd94a723ce", jar_urls = [ "https://maven.ibiblio.org/maven2/commons-codec/commons-codec/1.9/commons-codec-1.9.jar", "https://repo1.maven.org/maven2/commons-codec/commons-codec/1.9/commons-codec-1.9.jar", ], + licenses = ["notice"], # The Apache Software License, Version 2.0 ) java_import_external( name = "commons_logging", - licenses = ["notice"], # The Apache Software License, Version 2.0 jar_sha256 = "daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636", jar_urls = [ "https://maven.ibiblio.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar", "https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar", ], + licenses = ["notice"], # The Apache Software License, Version 2.0 ) java_import_external( name = "joda_time", - licenses = ["notice"], # Apache 2 jar_sha256 = "b4670b95f75957c974284c5f3ada966040be2578f643c5c6083d262162061fa2", jar_urls = [ "https://maven.ibiblio.org/maven2/joda-time/joda-time/2.8.1/joda-time-2.8.1.jar", "https://repo1.maven.org/maven2/joda-time/joda-time/2.8.1/joda-time-2.8.1.jar", ], + licenses = ["notice"], # Apache 2 ) java_import_external( name = "junit", - licenses = ["reciprocal"], # Eclipse Public License 1.0 jar_sha256 = "59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a", jar_urls = [ "https://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar", "https://maven.ibiblio.org/maven2/junit/junit/4.12/junit-4.12.jar", ], + licenses = ["reciprocal"], # Eclipse Public License 1.0 deps = ["@org_hamcrest_core"], ) java_import_external( name = "net_bytebuddy_byte_buddy", - licenses = ["notice"], # The Apache Software License, Version 2.0 jar_sha256 = "917758b3c651e278a15a029ba1d42dbf802d8b0e1fe2aa4b81c5750c64f461c1", jar_urls = [ "https://maven.ibiblio.org/maven2/net/bytebuddy/byte-buddy/1.6.14/byte-buddy-1.6.14.jar", "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.6.14/byte-buddy-1.6.14.jar", ], + licenses = ["notice"], # The Apache Software License, Version 2.0 deps = [ "@com_google_code_findbugs_annotations", ], @@ -419,67 +423,67 @@ java_import_external( java_import_external( name = "net_bytebuddy_byte_buddy_agent", - licenses = ["notice"], # The Apache Software License, Version 2.0 jar_sha256 = "c141a2d6809c3eeff4a43d25992826abccebdd4b793af3e7a5f346e88ae73a33", jar_urls = [ "https://maven.ibiblio.org/maven2/net/bytebuddy/byte-buddy-agent/1.6.14/byte-buddy-agent-1.6.14.jar", "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.6.14/byte-buddy-agent-1.6.14.jar", ], + licenses = ["notice"], # The Apache Software License, Version 2.0 ) java_import_external( name = "org_apache_httpcomponents_httpclient", - licenses = ["notice"], # Apache License, Version 2.0 jar_sha256 = "0dffc621400d6c632f55787d996b8aeca36b30746a716e079a985f24d8074057", jar_urls = [ "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.jar", "https://maven.ibiblio.org/maven2/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.jar", ], + licenses = ["notice"], # Apache License, Version 2.0 deps = [ - "@org_apache_httpcomponents_httpcore", - "@commons_logging", "@commons_codec", + "@commons_logging", + "@org_apache_httpcomponents_httpcore", ], ) java_import_external( name = "org_apache_httpcomponents_httpcore", - licenses = ["notice"], # Apache License, Version 2.0 jar_sha256 = "f7bc09dc8a7003822d109634ffd3845d579d12e725ae54673e323a7ce7f5e325", jar_urls = [ "https://maven.ibiblio.org/maven2/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4.jar", "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4.jar", ], + licenses = ["notice"], # Apache License, Version 2.0 ) java_import_external( name = "org_hamcrest_core", - licenses = ["notice"], # New BSD License jar_sha256 = "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9", jar_urls = [ "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar", "https://maven.ibiblio.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar", ], + licenses = ["notice"], # New BSD License ) java_import_external( name = "org_json", - licenses = ["notice"], # The JSON License jar_sha256 = "813f37e4820f1854e8a4eb4f80df94bf1b1f2ec6c3b72692f23ab9a556256af6", jar_urls = [ "https://maven.ibiblio.org/maven2/org/json/json/20170516/json-20170516.jar", "https://repo1.maven.org/maven2/org/json/json/20170516/json-20170516.jar", ], + licenses = ["notice"], # The JSON License ) java_import_external( name = "org_mockito_core", - licenses = ["notice"], # The MIT License jar_sha256 = "c496fe3790c55c07697cf37f5062f8758591ab035900bc108ce185b48df563a0", jar_urls = [ "https://repo1.maven.org/maven2/org/mockito/mockito-core/2.8.47/mockito-core-2.8.47.jar", "https://maven.ibiblio.org/maven2/org/mockito/mockito-core/2.8.47/mockito-core-2.8.47.jar", ], + licenses = ["notice"], # The MIT License deps = [ "@net_bytebuddy_byte_buddy", "@net_bytebuddy_byte_buddy_agent", @@ -489,22 +493,22 @@ java_import_external( java_import_external( name = "org_objenesis", - licenses = ["notice"], # Apache 2 jar_sha256 = "293328e1b0d31ed30bb89fca542b6c52fac00989bb0e62eb9d98d630c4dd6b7c", jar_urls = [ "https://maven.ibiblio.org/maven2/org/objenesis/objenesis/2.5/objenesis-2.5.jar", "https://repo1.maven.org/maven2/org/objenesis/objenesis/2.5/objenesis-2.5.jar", ], + licenses = ["notice"], # Apache 2 ) java_import_external( name = "software_amazon_ion_java", - licenses = ["notice"], # The Apache License, Version 2.0 jar_sha256 = "0d127b205a1fce0abc2a3757a041748651bc66c15cf4c059bac5833b27d471a5", jar_urls = [ "https://repo1.maven.org/maven2/software/amazon/ion/ion-java/1.0.2/ion-java-1.0.2.jar", "https://maven.ibiblio.org/maven2/software/amazon/ion/ion-java/1.0.2/ion-java-1.0.2.jar", ], + licenses = ["notice"], # The Apache License, Version 2.0 ) # END BAZEL MAVEN CONFIG GENERATOR @@ -516,30 +520,32 @@ java_import_external( http_archive( name = "build_bazel_rules_apple", + sha256 = "bcc39ad59bf3439e1fd704ab553857b77a865f7e30fe612699aeb12f6882a191", strip_prefix = "rules_apple-0.6.0", url = "https://github.com/bazelbuild/rules_apple/archive/0.6.0.zip", - sha256 = "bcc39ad59bf3439e1fd704ab553857b77a865f7e30fe612699aeb12f6882a191", ) http_archive( name = "bazel_skylib", + sha256 = "b546c142abd7524e4d60959c19b0c387fe282f309be5efb7e0abae476b7bbef9", strip_prefix = "bazel-skylib-0.4.0", url = "https://github.com/bazelbuild/bazel-skylib/archive/0.4.0.zip", - sha256 = "b546c142abd7524e4d60959c19b0c387fe282f309be5efb7e0abae476b7bbef9", ) http_archive( name = "build_bazel_rules_swift", + sha256 = "93e088c8b79a5c5eaa08fca43429fdcbeb88e71575d4fa34d2d53e3deb9e53c4", strip_prefix = "rules_swift-0.2.0", url = "https://github.com/bazelbuild/rules_swift/archive/0.2.0.zip", - sha256 = "93e088c8b79a5c5eaa08fca43429fdcbeb88e71575d4fa34d2d53e3deb9e53c4", ) http_file( name = "xctestrunner", executable = 1, - url = "https://github.com/google/xctestrunner/releases/download/0.2.1/ios_test_runner.par", sha256 = "5bfbd45c5ac89305e8bf3296999d490611b88d4d828b2a39ef6037027411aa94", + urls = [ + "https://github.com/google/xctestrunner/releases/download/0.2.1/ios_test_runner.par", + ], ) #----------------------------------------------------------------------------- @@ -547,10 +553,12 @@ http_file( #----------------------------------------------------------------------------- http_archive( name = "io_bazel_rules_go", - url = "https://github.com/bazelbuild/rules_go/releases/download/0.10.1/rules_go-0.10.1.tar.gz", sha256 = "4b14d8dd31c6dbaf3ff871adcd03f28c3274e42abc855cb8fb4d01233c0154dc", + url = "https://github.com/bazelbuild/rules_go/releases/download/0.10.1/rules_go-0.10.1.tar.gz", ) load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains") + go_rules_dependencies() + go_register_toolchains() From 2deb7ff85fdc6a92602c76d28c1f61a5cc93c5a2 Mon Sep 17 00:00:00 2001 From: tholenst Date: Thu, 3 Jan 2019 06:20:12 -0800 Subject: [PATCH 04/12] Update the javalite proto archive. The javalite archive was updated on December 19: https://github.com/protocolbuffers/protobuf/commits/javalite This means that the branch given by javalite.zip updates, so the hash changes. In principle, I would like to be able to check on my corp machine that this changes are exactly what I now have in the new machine. Unfortunately, I don't know how to download the previous archive with the sha256 hash to create a diff. In order to make sure this works in the future, I suggest we download the archive by commit. For this, if you continue from the above link to the topmost commit, you get that the id of the link is 384...16 -- we copy this as the url and then we can get the corresponding sha256 sum on the local machine. If the branch updates, we need to manually update it. The disadvantage is that we don't get cherry picks automatically. This fixes issue 166. PiperOrigin-RevId: 227678791 GitOrigin-RevId: cceb31b558c4fa9ca7613287cd69a8bad5f60798 (cherry picked from commit cd94de64cea4f7d7c5109fc84bd719940336644b) --- WORKSPACE | 6 +++--- kokoro/run_tests.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 2b50b07613..e2fc2f4b10 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -66,9 +66,9 @@ http_archive( # runtime (base classes and common utilities). http_archive( name = "com_google_protobuf_javalite", - sha256 = "38458deb90db61c054b708e141544c32863ab14a8747710ba3ee290d9b6dab92", - strip_prefix = "protobuf-javalite", - urls = ["https://github.com/google/protobuf/archive/javalite.zip"], + sha256 = "79d102c61e2a479a0b7e5fc167bcfaa4832a0c6aad4a75fa7da0480564931bcc", + strip_prefix = "protobuf-384989534b2246d413dbcd750744faab2607b516", + urls = ["https://github.com/google/protobuf/archive/384989534b2246d413dbcd750744faab2607b516.zip"], ) #----------------------------------------------------------------------------- diff --git a/kokoro/run_tests.sh b/kokoro/run_tests.sh index acfa3617d3..1e4b58d713 100755 --- a/kokoro/run_tests.sh +++ b/kokoro/run_tests.sh @@ -69,7 +69,7 @@ echo "using go: $(which go)" go version run_linux_tests() { - time bazel fetch ... + time bazel fetch --logging=6 --build_event_publish_all_actions --announce_rc ... # Build all targets, except objc. time bazel build "${DISABLE_SANDBOX_ARGS[@]}" \ From d57a415b1d7f9cc6c32547f94987b2a919b17e9d Mon Sep 17 00:00:00 2001 From: tholenst Date: Thu, 3 Jan 2019 06:46:04 -0800 Subject: [PATCH 05/12] Update protobuf library to v.3.6.1.2. This is required to make the build work with the newest bazel binary. See https://github.com/protocolbuffers/protobuf/issues/5418 PiperOrigin-RevId: 227681358 GitOrigin-RevId: 1df09b7dbe849a527f2da882e96483f3e967a26b (cherry picked from commit dc53e5e519f01ecb8a44569bd2a2bf278a32e192) --- WORKSPACE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index e2fc2f4b10..d9d87d115e 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -56,9 +56,9 @@ http_archive( # This statement defines the @com_google_protobuf repo. http_archive( name = "com_google_protobuf", - sha256 = "e514c2e613dc47c062ea8df480efeec368ffbef98af0437ac00cdaadcb0d80d2", - strip_prefix = "protobuf-3.6.0", - urls = ["https://github.com/google/protobuf/archive/v3.6.0.zip"], + sha256 = "d6618d117698132dadf0f830b762315807dc424ba36ab9183f1f436008a2fdb6", + strip_prefix = "protobuf-3.6.1.2", + urls = ["https://github.com/google/protobuf/archive/v3.6.1.2.zip"], ) # java_lite_proto_library rules implicitly depend on From 59943c6f980fa9c59f524b5dca1168601fccda7d Mon Sep 17 00:00:00 2001 From: thaidn Date: Tue, 15 Jan 2019 18:06:42 -0800 Subject: [PATCH 06/12] Use the KeyFactory from the same provider as the KeyAgreement. PiperOrigin-RevId: 229476935 GitOrigin-RevId: dad4536a60155fa36a98e7bfc398384daae56694 (cherry picked from commit 5e0aabfe6467687781d2dbf6557e8511346935d5) --- .../java/com/google/crypto/tink/subtle/EllipticCurves.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/java/src/main/java/com/google/crypto/tink/subtle/EllipticCurves.java b/java/src/main/java/com/google/crypto/tink/subtle/EllipticCurves.java index e8fa7da08b..52b17ca723 100644 --- a/java/src/main/java/com/google/crypto/tink/subtle/EllipticCurves.java +++ b/java/src/main/java/com/google/crypto/tink/subtle/EllipticCurves.java @@ -935,9 +935,8 @@ public static byte[] computeSharedSecret(ECPrivateKey myPrivateKey, ECPoint publ checkPointOnCurve(publicPoint, myPrivateKey.getParams().getCurve()); // Explicitly reconstruct the peer public key using private key's spec. ECParameterSpec privSpec = myPrivateKey.getParams(); - EllipticCurve privCurve = privSpec.getCurve(); ECPublicKeySpec publicKeySpec = new ECPublicKeySpec(publicPoint, privSpec); - KeyFactory kf = KeyFactory.getInstance("EC"); + KeyFactory kf = EngineFactory.KEY_FACTORY.getInstance("EC"); PublicKey publicKey = kf.generatePublic(publicKeySpec); KeyAgreement ka = EngineFactory.KEY_AGREEMENT.getInstance("ECDH"); ka.init(myPrivateKey); From df989569c79e6b45b201a59b46dab0816eadb846 Mon Sep 17 00:00:00 2001 From: Charles Lee Date: Fri, 18 Jan 2019 16:11:59 -0800 Subject: [PATCH 07/12] Additional updates for compatibility with the latest Bazel release. --- BUILD.bazel | 12 +++--------- WORKSPACE | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index cc05a4086f..f2bb547125 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -9,13 +9,7 @@ licenses(["notice"]) # Apache 2.0 exports_files(["LICENSE"]) -# All go packages use github.com/google/tink prefix -load("@io_bazel_rules_go//go:def.bzl", "gazelle") - -# bazel rule definition -gazelle( - name = "gazelle", - command = "update", - prefix = "github.com/google/tink", -) +load("@bazel_gazelle//:def.bzl", "gazelle") +# gazelle:prefix github.com/google/go +gazelle(name = "gazelle") diff --git a/WORKSPACE b/WORKSPACE index d9d87d115e..dabd55dde5 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -39,7 +39,7 @@ http_archive( http_archive( name = "rapidjson", - build_file = "third_party/rapidjson.BUILD.bazel", + build_file = "//:third_party/rapidjson.BUILD.bazel", sha256 = "bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e", strip_prefix = "rapidjson-1.1.0", urls = [ @@ -553,8 +553,14 @@ http_file( #----------------------------------------------------------------------------- http_archive( name = "io_bazel_rules_go", - sha256 = "4b14d8dd31c6dbaf3ff871adcd03f28c3274e42abc855cb8fb4d01233c0154dc", - url = "https://github.com/bazelbuild/rules_go/releases/download/0.10.1/rules_go-0.10.1.tar.gz", + sha256 = "f87fa87475ea107b3c69196f39c82b7bbf58fe27c62a338684c20ca17d1d8613", + url = "https://github.com/bazelbuild/rules_go/releases/download/0.16.2/rules_go-0.16.2.tar.gz", +) + +http_archive( + name = "bazel_gazelle", + sha256 = "c0a5739d12c6d05b6c1ad56f2200cb0b57c5a70e03ebd2f7b87ce88cabf09c7b", + urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/0.14.0/bazel-gazelle-0.14.0.tar.gz"], ) load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains") @@ -562,3 +568,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_too go_rules_dependencies() go_register_toolchains() + +load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") + +gazelle_dependencies() From e32864b26fbd3ee4d5449f21c266c117d6010edb Mon Sep 17 00:00:00 2001 From: tholenst Date: Tue, 15 Jan 2019 04:38:17 -0800 Subject: [PATCH 08/12] Update to the newest version of googletest to enable cl/229243192. PiperOrigin-RevId: 229349991 GitOrigin-RevId: 2aa804f1e5d093cb633864b7228c56918931eb21 (cherry picked from commit edc4dbc9a3c5fab5083b59a53351207014aec3f6) --- WORKSPACE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index dabd55dde5..5b0d059cf1 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -32,9 +32,9 @@ http_archive( # GoogleTest/GoogleMock framework. Used by most C++ unit-tests. http_archive( name = "com_google_googletest", - sha256 = "9431adb18d26a304d864c2b05f6e5a165e73108fc89a110f5b27d65d7e51680b", - strip_prefix = "googletest-61330388862cf011fa956f7f59082b9923e6be0e", - url = "https://github.com/google/googletest/archive/61330388862cf011fa956f7f59082b9923e6be0e.zip", + sha256 = "a7db7d1295ce46b93f3d1a90dbbc55a48409c00d19684fcd87823037add88118", + strip_prefix = "googletest-eb9225ce361affe561592e0912320b9db84985d0", + url = "https://github.com/google/googletest/archive/eb9225ce361affe561592e0912320b9db84985d0.zip", ) http_archive( From 4c48663839ad9e2ed9423fb6db55ab975ca9e11c Mon Sep 17 00:00:00 2001 From: Charles Lee Date: Fri, 18 Jan 2019 16:46:59 -0800 Subject: [PATCH 09/12] Update unit test shell scripts to point to the correct runfiles location. --- examples/helloworld/cc/hello_world_test.sh | 2 +- examples/helloworld/cc/non_bazel_build_test.sh | 2 +- tools/testing/cross_language/aead_test.sh | 2 +- tools/testing/cross_language/hybrid_encryption_test.sh | 2 +- tools/testing/cross_language/keyset_reader_writer_test.sh | 2 +- tools/testing/cross_language/signature_test.sh | 2 +- tools/testing/cross_language/test_util.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/helloworld/cc/hello_world_test.sh b/examples/helloworld/cc/hello_world_test.sh index 93aa7ba924..edd2fe07cf 100755 --- a/examples/helloworld/cc/hello_world_test.sh +++ b/examples/helloworld/cc/hello_world_test.sh @@ -3,7 +3,7 @@ ############################################################################# ##### Tests for hello_world binary. -ROOT_DIR="$TEST_SRCDIR/__main__" +ROOT_DIR="$TEST_SRCDIR/tink" HELLO_WORLD_CLI="$ROOT_DIR/examples/helloworld/cc/hello_world" KEYSET_FILE="$ROOT_DIR/examples/helloworld/cc/aes128_gcm_test_keyset_json.txt" diff --git a/examples/helloworld/cc/non_bazel_build_test.sh b/examples/helloworld/cc/non_bazel_build_test.sh index 15756ca307..0d7aac7dad 100755 --- a/examples/helloworld/cc/non_bazel_build_test.sh +++ b/examples/helloworld/cc/non_bazel_build_test.sh @@ -3,7 +3,7 @@ ############################################################################# ##### Tests for installing and using Tink in a non-Bazel project. -ROOT_DIR="$TEST_SRCDIR/__main__" +ROOT_DIR="$TEST_SRCDIR/tink" TARGET_DIR="$TEST_TMPDIR/my_project" HELLO_WORLD_SRC="$ROOT_DIR/examples/helloworld/cc/hello_world.cc" KEYSET_FILE="$ROOT_DIR/examples/helloworld/cc/aes128_gcm_test_keyset_json.txt" diff --git a/tools/testing/cross_language/aead_test.sh b/tools/testing/cross_language/aead_test.sh index fddcd1cb8a..6d7c6715d5 100755 --- a/tools/testing/cross_language/aead_test.sh +++ b/tools/testing/cross_language/aead_test.sh @@ -13,7 +13,7 @@ #!/bin/bash -ROOT_DIR="$TEST_SRCDIR/__main__" +ROOT_DIR="$TEST_SRCDIR/tink" CC_AEAD_CLI="$ROOT_DIR/tools/testing/cc/aead_cli_cc" JAVA_AEAD_CLI="$ROOT_DIR/tools/testing/aead_cli_java" TEST_UTIL="$ROOT_DIR/tools/testing/cross_language/test_util.sh" diff --git a/tools/testing/cross_language/hybrid_encryption_test.sh b/tools/testing/cross_language/hybrid_encryption_test.sh index 4f3d3ba5f0..de0086364b 100755 --- a/tools/testing/cross_language/hybrid_encryption_test.sh +++ b/tools/testing/cross_language/hybrid_encryption_test.sh @@ -13,7 +13,7 @@ #!/bin/bash -ROOT_DIR="$TEST_SRCDIR/__main__" +ROOT_DIR="$TEST_SRCDIR/tink" CC_ENCRYPT_CLI="$ROOT_DIR/tools/testing/cc/hybrid_encrypt_cli_cc" CC_DECRYPT_CLI="$ROOT_DIR/tools/testing/cc/hybrid_decrypt_cli_cc" JAVA_ENCRYPT_CLI="$ROOT_DIR/tools/testing/hybrid_encrypt_cli_java" diff --git a/tools/testing/cross_language/keyset_reader_writer_test.sh b/tools/testing/cross_language/keyset_reader_writer_test.sh index 06979c9010..ae63b8a90d 100755 --- a/tools/testing/cross_language/keyset_reader_writer_test.sh +++ b/tools/testing/cross_language/keyset_reader_writer_test.sh @@ -13,7 +13,7 @@ #!/bin/bash -ROOT_DIR="$TEST_SRCDIR/__main__" +ROOT_DIR="$TEST_SRCDIR/tink" CC_KEYSET_RW_CLI="$ROOT_DIR/tools/testing/cc/keyset_reader_writer_cli" JAVA_KEYSET_RW_CLI="$ROOT_DIR/tools/tinkey/tinkey" TEST_UTIL="$ROOT_DIR/tools/testing/cross_language/test_util.sh" diff --git a/tools/testing/cross_language/signature_test.sh b/tools/testing/cross_language/signature_test.sh index dfc443d7bc..381ed934e0 100755 --- a/tools/testing/cross_language/signature_test.sh +++ b/tools/testing/cross_language/signature_test.sh @@ -13,7 +13,7 @@ #!/bin/bash -ROOT_DIR="$TEST_SRCDIR/__main__" +ROOT_DIR="$TEST_SRCDIR/tink" CC_SIGN_CLI="$ROOT_DIR/tools/testing/cc/public_key_sign_cli_cc" CC_VERIFY_CLI="$ROOT_DIR/tools/testing/cc/public_key_verify_cli_cc" JAVA_SIGN_CLI="$ROOT_DIR/tools/testing/public_key_sign_cli_java" diff --git a/tools/testing/cross_language/test_util.sh b/tools/testing/cross_language/test_util.sh index 8c7b5b2aca..b3005f126a 100755 --- a/tools/testing/cross_language/test_util.sh +++ b/tools/testing/cross_language/test_util.sh @@ -13,7 +13,7 @@ #!/bin/bash -ROOT_DIR="$TEST_SRCDIR/__main__" +ROOT_DIR="$TEST_SRCDIR/tink" TINKEY_CLI="$ROOT_DIR/tools/tinkey/tinkey" ############################################################################# From 42ca5764a2e21c2eed571959c57692fc42f173cd Mon Sep 17 00:00:00 2001 From: tholenst Date: Wed, 24 Oct 2018 02:52:52 -0700 Subject: [PATCH 10/12] Upgrade absl to the newest version PiperOrigin-RevId: 218484337 GitOrigin-RevId: 255faba2d79cea1f16d3f0e57e4aeac02644172f (cherry picked from commit b3b26b78f8f5c27691b0fda49b538069d0814e50) --- WORKSPACE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 5b0d059cf1..7e6f799cdd 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -17,9 +17,9 @@ http_archive( #----------------------------------------------------------------------------- http_archive( name = "com_google_absl", - sha256 = "9094c76bb75bb02bafbdc7339d3a6b331bd23d76c357813ac963916f2f12ec11", - strip_prefix = "abseil-cpp-6cf9c731027f4d8aebe3c60df8e64317e6870870", - url = "https://github.com/abseil/abseil-cpp/archive/6cf9c731027f4d8aebe3c60df8e64317e6870870.zip", + sha256 = "84b4277a9b56f9a192952beca535313497826c6ff2e38b2cac7351a3ed2ae780", + strip_prefix = "abseil-cpp-c476da141ca9cffc2137baf85872f0cae9ffa9ad", + url = "https://github.com/abseil/abseil-cpp/archive/c476da141ca9cffc2137baf85872f0cae9ffa9ad.zip", ) http_archive( From de56db85fcc87565408f445e16752dbdb768486f Mon Sep 17 00:00:00 2001 From: tholenst Date: Mon, 7 Jan 2019 02:05:51 -0800 Subject: [PATCH 11/12] Undo a change I mistakenly introduced in cl/227678791. PiperOrigin-RevId: 228127467 GitOrigin-RevId: 7f5b5d4ca8ce8bfea88bf5bfd39712717c52df9f (cherry picked from commit 5c2ad639bb6cf3c8125cb4c5c9c080922a8da0d3) --- kokoro/run_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kokoro/run_tests.sh b/kokoro/run_tests.sh index 1e4b58d713..acfa3617d3 100755 --- a/kokoro/run_tests.sh +++ b/kokoro/run_tests.sh @@ -69,7 +69,7 @@ echo "using go: $(which go)" go version run_linux_tests() { - time bazel fetch --logging=6 --build_event_publish_all_actions --announce_rc ... + time bazel fetch ... # Build all targets, except objc. time bazel build "${DISABLE_SANDBOX_ARGS[@]}" \ From 6f073f11f59c703b14793f9f8cbf7a3aa7ac4a89 Mon Sep 17 00:00:00 2001 From: ckl Date: Thu, 24 Jan 2019 14:00:18 -0800 Subject: [PATCH 12/12] Bumping version number to 1.2.2. PiperOrigin-RevId: 230785575 GitOrigin-RevId: b9a858a2c74ef3d7a5e9d6adca72d4b02b6ff621 (cherry picked from commit 621b573ea034f95e9ac7c50aca31d5e6c5250684) --- README.md | 4 ++-- apps/paymentmethodtoken/README.md | 8 ++++---- apps/webpush/README.md | 4 ++-- cc/version_script.lds | 2 +- docs/JAVA-HOWTO.md | 8 ++++---- objc/CHANGELOG | 5 +++++ 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index e979ccfb3b..d1132d9af5 100644 --- a/README.md +++ b/README.md @@ -84,8 +84,8 @@ AEAD primitive in Java: * [Java and Android](docs/JAVA-HOWTO.md), [C++](docs/CPP-HOWTO.md) and [Obj-C](docs/OBJC-HOWTO.md) are field tested and ready for production. The latest version is - [1.2.1](https://github.com/google/tink/releases/tag/v1.2.1), released on - 2018-11-15. + [1.2.2](https://github.com/google/tink/releases/tag/v1.2.2), released on + 2019-01-24. * Tink for Go and JavaScript are in active development. diff --git a/apps/paymentmethodtoken/README.md b/apps/paymentmethodtoken/README.md index 37ad932715..3f17e46925 100644 --- a/apps/paymentmethodtoken/README.md +++ b/apps/paymentmethodtoken/README.md @@ -3,9 +3,9 @@ ## Latest release The most recent release is -[1.2.1](https://github.com/google/tink/releases/tag/v1.2.1), released -2018-08-09. API docs can be found -[here](https://google.github.com/tink/javadoc/apps-paymentmethodtoken/1.2.1). +[1.2.2](https://github.com/google/tink/releases/tag/v1.2.2), released +2019-01-24. API docs can be found +[here](https://google.github.com/tink/javadoc/apps-paymentmethodtoken/1.2.2). The Maven group ID is `com.google.crypto.tink`, and the artifact ID is `apps-paymentmethodtoken`. @@ -16,7 +16,7 @@ To add a dependency using Maven: com.google.crypto.tink apps-paymentmethodtoken - 1.2.1 + 1.2.2 ``` diff --git a/apps/webpush/README.md b/apps/webpush/README.md index 3db5e885b9..b4ef9519ec 100644 --- a/apps/webpush/README.md +++ b/apps/webpush/README.md @@ -11,7 +11,7 @@ To add a dependency using Maven: com.google.crypto.tink apps-webpush - 1.2.1 + 1.2.2 ``` @@ -19,7 +19,7 @@ To add a dependency using Gradle: ``` dependencies { - compile 'com.google.crypto.tink:apps-webpush:1.2.1' + compile 'com.google.crypto.tink:apps-webpush:1.2.2' } ``` diff --git a/cc/version_script.lds b/cc/version_script.lds index cd158e57e4..6fbcc0e1e1 100644 --- a/cc/version_script.lds +++ b/cc/version_script.lds @@ -1,4 +1,4 @@ -VERS_1.2.1 { +VERS_1.2.2 { global: *tink*; *absl*; diff --git a/docs/JAVA-HOWTO.md b/docs/JAVA-HOWTO.md index dd505835ed..a7fb5aa5ff 100644 --- a/docs/JAVA-HOWTO.md +++ b/docs/JAVA-HOWTO.md @@ -16,8 +16,8 @@ Tink can be installed with Maven or Gradle. The Maven group ID is `com.google.crypto.tink`, and the artifact ID is `tink`. The most recent release is -[1.2.1](https://github.com/google/tink/releases/tag/v1.2.1), released -2018-11-12. +[1.2.2](https://github.com/google/tink/releases/tag/v1.2.2), released +2019-01-24. Java developers can add Tink using Maven: @@ -25,7 +25,7 @@ Java developers can add Tink using Maven: com.google.crypto.tink tink - 1.2.1 + 1.2.2 ``` @@ -33,7 +33,7 @@ Android developers can add Tink using Gradle: ``` dependencies { - compile 'com.google.crypto.tink:tink-android:1.2.1' + compile 'com.google.crypto.tink:tink-android:1.2.2' } ``` diff --git a/objc/CHANGELOG b/objc/CHANGELOG index 1304bc50ce..272aee28db 100644 --- a/objc/CHANGELOG +++ b/objc/CHANGELOG @@ -1,3 +1,8 @@ +Version 1.2.2 +================================== +Staticly linking BoringSSL in the CocoaPod build to prevent namespace clashes +when Tink is used alongside pods that depend on OpenSSL. + Version 1.2.1 ================================== No changes to the Obj-C implementation.