summaryrefslogtreecommitdiffstats
path: root/crypto/evp/encode.c
diff options
context:
space:
mode:
authorLutz Jänicke <jaenicke@openssl.org>2002-04-15 09:55:40 +0000
committerLutz Jänicke <jaenicke@openssl.org>2002-04-15 09:55:40 +0000
commit2940a1298eea7b25b2bd5e13f3b45de3b1944008 (patch)
treee1fea7a7f0594ad9defc937d9f0c5f5527597018 /crypto/evp/encode.c
parentf916052eab814b08cb50b501cb14d41f851cfd32 (diff)
Fix CRLF problem in BASE64 decode.
Diffstat (limited to 'crypto/evp/encode.c')
-rw-r--r--crypto/evp/encode.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/evp/encode.c b/crypto/evp/encode.c
index 6ff9c1783c..12c6379df1 100644
--- a/crypto/evp/encode.c
+++ b/crypto/evp/encode.c
@@ -277,6 +277,13 @@ int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
eof++;
}
+ if (v == B64_CR)
+ {
+ ln = 0;
+ if (exp_nl)
+ continue;
+ }
+
/* eoln */
if (v == B64_EOLN)
{