experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24666 from perfinion:openssl11

Browse Source 
PiperOrigin-RevId: 228214198
This commit is contained in:
TensorFlower Gardener 2019-01-07 13:19:38 -08:00
commit 9dfc1ddf24
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tensorflow/core/platform/cloud/oauth_client.cc
View File

@ -95,6 +95,11 @@ Status CreateSignature(RSA* private_key, StringPiece to_sign,
if (!md) { if (!md) {
return errors::Internal("Could not get a sha256 encryptor."); return errors::Internal("Could not get a sha256 encryptor.");
} }
// EVP_MD_CTX_destroy is renamed to EVP_MD_CTX_free in OpenSSL 1.1.0 but
// the old name is still retained as a compatibility macro.
// Keep this around until support is dropped for OpenSSL 1.0
// https://www.openssl.org/news/cl110.txt
std::unique_ptr<EVP_MD_CTX, std::function<void(EVP_MD_CTX*)>> md_ctx( std::unique_ptr<EVP_MD_CTX, std::function<void(EVP_MD_CTX*)>> md_ctx(
EVP_MD_CTX_create(), [](EVP_MD_CTX* ptr) { EVP_MD_CTX_destroy(ptr); }); EVP_MD_CTX_create(), [](EVP_MD_CTX* ptr) { EVP_MD_CTX_destroy(ptr); });
if (!md_ctx) { if (!md_ctx) {
@ -119,7 +124,6 @@ Status CreateSignature(RSA* private_key, StringPiece to_sign,
if (EVP_DigestSignFinal(md_ctx.get(), sig.get(), &sig_len) != 1) { if (EVP_DigestSignFinal(md_ctx.get(), sig.get(), &sig_len) != 1) {
return errors::Internal("DigestFinal (signature compute) failed."); return errors::Internal("DigestFinal (signature compute) failed.");
} }
EVP_MD_CTX_cleanup(md_ctx.get());
return Base64Encode(StringPiece(reinterpret_cast<char*>(sig.get()), sig_len), return Base64Encode(StringPiece(reinterpret_cast<char*>(sig.get()), sig_len),
signature); signature);
} }

1
tensorflow/core/platform/cloud/oauth_client_test.cc
View File

@ -166,7 +166,6 @@ TEST(OAuthClientTest, GetTokenFromServiceAccountJson) {
const_cast<unsigned char*>( const_cast<unsigned char*>(
reinterpret_cast<const unsigned char*>(signature.data())), reinterpret_cast<const unsigned char*>(signature.data())),
signature.size())); signature.size()));
EVP_MD_CTX_cleanup(md_ctx);
// Free all the crypto-related resources. // Free all the crypto-related resources.
EVP_PKEY_free(key); EVP_PKEY_free(key);