diff options
| author | Shigeki Ohtsu <ohtsu@ohtsu.org> | 2018-03-27 23:34:31 +0900 |
|---|---|---|
| committer | Myles Borins <mylesborins@google.com> | 2018-03-27 20:17:18 -0400 |
| commit | d10b7f1cdf8824dc53fbdd4b4617c860f0d8cb80 (patch) | |
| tree | 7f4b716eff55fd05905240ebb0cc041688c93dfb /deps/openssl/openssl/crypto/evp/e_aes.c | |
| parent | df62e69de73f4fb199f3b88727d13f6c52de332a (diff) | |
| download | android-node-v8-d10b7f1cdf8824dc53fbdd4b4617c860f0d8cb80.tar.gz android-node-v8-d10b7f1cdf8824dc53fbdd4b4617c860f0d8cb80.tar.bz2 android-node-v8-d10b7f1cdf8824dc53fbdd4b4617c860f0d8cb80.zip | |
deps: upgrade openssl sources to 1.0.2o
This replaces all sources of openssl-1.0.2o.tar.gz into
deps/openssl/openssl
PR-URL: https://github.com/nodejs/node/pull/19638
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'deps/openssl/openssl/crypto/evp/e_aes.c')
| -rw-r--r-- | deps/openssl/openssl/crypto/evp/e_aes.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/deps/openssl/openssl/crypto/evp/e_aes.c b/deps/openssl/openssl/crypto/evp/e_aes.c index b45b364466..ccc626f1d8 100644 --- a/deps/openssl/openssl/crypto/evp/e_aes.c +++ b/deps/openssl/openssl/crypto/evp/e_aes.c @@ -1,5 +1,5 @@ /* ==================================================================== - * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved. + * Copyright (c) 2001-2018 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -1089,6 +1089,8 @@ static int aes_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, CRYPTO_cfb128_1_encrypt(in, out, MAXBITCHUNK * 8, &dat->ks, ctx->iv, &ctx->num, ctx->encrypt, dat->block); len -= MAXBITCHUNK; + out += MAXBITCHUNK; + in += MAXBITCHUNK; } if (len) CRYPTO_cfb128_1_encrypt(in, out, len * 8, &dat->ks, |