diff options
author | Sam Roberts <vieuxtech@gmail.com> | 2019-09-13 08:55:54 -0700 |
---|---|---|
committer | Sam Roberts <vieuxtech@gmail.com> | 2019-10-01 11:07:43 -0700 |
commit | 17d1d164418552089fcd72568e97a88b17ec1d21 (patch) | |
tree | 3cafb16ee95930be56fb17704c270a9909ae2d44 /deps/openssl/openssl/crypto/evp/evp_lib.c | |
parent | 7ce316e6a263f313489eea2150bfde228a7e3c41 (diff) | |
download | android-node-v8-17d1d164418552089fcd72568e97a88b17ec1d21.tar.gz android-node-v8-17d1d164418552089fcd72568e97a88b17ec1d21.tar.bz2 android-node-v8-17d1d164418552089fcd72568e97a88b17ec1d21.zip |
deps: upgrade openssl sources to 1.1.1d
This updates all sources in deps/openssl/openssl by:
$ cd deps/openssl/
$ rm -rf openssl
$ tar zxf ~/tmp/openssl-1.1.0h.tar.gz
$ mv openssl-1.1.0h openssl
$ git add --all openssl
$ git commit openssl
PR-URL: https://github.com/nodejs/node/pull/29550
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'deps/openssl/openssl/crypto/evp/evp_lib.c')
-rw-r--r-- | deps/openssl/openssl/crypto/evp/evp_lib.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/deps/openssl/openssl/crypto/evp/evp_lib.c b/deps/openssl/openssl/crypto/evp/evp_lib.c index 1b3c9840c6..4935c2a94a 100644 --- a/deps/openssl/openssl/crypto/evp/evp_lib.c +++ b/deps/openssl/openssl/crypto/evp/evp_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -242,6 +242,13 @@ int EVP_CIPHER_iv_length(const EVP_CIPHER *cipher) int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx) { + int i, rv; + + if ((EVP_CIPHER_flags(ctx->cipher) & EVP_CIPH_CUSTOM_IV_LENGTH) != 0) { + rv = EVP_CIPHER_CTX_ctrl((EVP_CIPHER_CTX *)ctx, EVP_CTRL_GET_IVLEN, + 0, &i); + return (rv == 1) ? i : -1; + } return ctx->cipher->iv_len; } |