aboutsummaryrefslogtreecommitdiff
path: root/deps/openssl/openssl/crypto/evp/encode.c
diff options
context:
space:
mode:
authorShigeki Ohtsu <ohtsu@iij.ad.jp>2015-06-12 00:00:05 +0900
committerShigeki Ohtsu <ohtsu@iij.ad.jp>2015-06-12 09:47:44 +0900
commitc21b24decf6fef3d808cdf1e2fa58be156898d65 (patch)
tree3c4cfc597b96b6fbb1c1f18bce4693396c97b32d /deps/openssl/openssl/crypto/evp/encode.c
parenta6b8ee19b85bbd798510191f0aee596f36b909d2 (diff)
downloadandroid-node-v8-c21b24decf6fef3d808cdf1e2fa58be156898d65.tar.gz
android-node-v8-c21b24decf6fef3d808cdf1e2fa58be156898d65.tar.bz2
android-node-v8-c21b24decf6fef3d808cdf1e2fa58be156898d65.zip
deps: upgrade openssl sources to 1.0.2b
This just replaces all sources of openssl-1.0.2b.tar.gz into deps/openssl/openssl Fixes: https://github.com/nodejs/io.js/issues/1921 PR-URL: https://github.com/nodejs/io.js/pull/1950 Reviewed-By: Fedor Indutny <fedor@indutny.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/openssl/openssl/crypto/evp/encode.c')
-rw-r--r--deps/openssl/openssl/crypto/evp/encode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/deps/openssl/openssl/crypto/evp/encode.c b/deps/openssl/openssl/crypto/evp/encode.c
index d1d8a07c14..c361d1f012 100644
--- a/deps/openssl/openssl/crypto/evp/encode.c
+++ b/deps/openssl/openssl/crypto/evp/encode.c
@@ -137,7 +137,7 @@ void EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
unsigned int total = 0;
*outl = 0;
- if (inl == 0)
+ if (inl <= 0)
return;
OPENSSL_assert(ctx->length <= (int)sizeof(ctx->enc_data));
if ((ctx->num + inl) < ctx->length) {
@@ -248,7 +248,7 @@ int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
/* We parse the input data */
for (i = 0; i < inl; i++) {
- /* If the current line is > 80 characters, scream alot */
+ /* If the current line is > 80 characters, scream a lot */
if (ln >= 80) {
rv = -1;
goto end;