diff options
| author | nectar <nectar@FreeBSD.org> | 2002-07-30 12:44:15 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2002-07-30 12:44:15 +0000 |
| commit | 0aed2eea83b351d68092e43b5a9496ce3dd5043d (patch) | |
| tree | a6133c35ab337984fbbd26293f8b1ad7a958132b /crypto/openssl/crypto/evp | |
| parent | 1f8c2aa1763b5d8a328b2fd4053396e94ea48d35 (diff) | |
| download | FreeBSD-src-0aed2eea83b351d68092e43b5a9496ce3dd5043d.zip FreeBSD-src-0aed2eea83b351d68092e43b5a9496ce3dd5043d.tar.gz | |
Import of OpenSSL 0.9.6d.
Diffstat (limited to 'crypto/openssl/crypto/evp')
| -rw-r--r-- | crypto/openssl/crypto/evp/encode.c | 7 | ||||
| -rw-r--r-- | crypto/openssl/crypto/evp/evp.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/evp/encode.c b/crypto/openssl/crypto/evp/encode.c index 6ff9c17..12c6379 100644 --- a/crypto/openssl/crypto/evp/encode.c +++ b/crypto/openssl/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) { diff --git a/crypto/openssl/crypto/evp/evp.h b/crypto/openssl/crypto/evp/evp.h index a61e46b..32d6e7c 100644 --- a/crypto/openssl/crypto/evp/evp.h +++ b/crypto/openssl/crypto/evp/evp.h @@ -499,7 +499,7 @@ typedef int (EVP_PBE_KEYGEN)(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, #define EVP_CIPHER_key_length(e) ((e)->key_len) #define EVP_CIPHER_iv_length(e) ((e)->iv_len) #define EVP_CIPHER_flags(e) ((e)->flags) -#define EVP_CIPHER_mode(e) ((e)->flags) & EVP_CIPH_MODE) +#define EVP_CIPHER_mode(e) (((e)->flags) & EVP_CIPH_MODE) #define EVP_CIPHER_CTX_cipher(e) ((e)->cipher) #define EVP_CIPHER_CTX_nid(e) ((e)->cipher->nid) |
