diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-07-26 20:53:58 +0400 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-07-26 20:53:58 +0400 |
| commit | 2dbef509e27a14a6358d3dd33abfb60320f7c763 (patch) | |
| tree | 92d66690cd73f0ecd789f0dce90fe9b83cd0717a /crypto/evp | |
| parent | a4125514f5eb538848622d6c3ae04a3d38fddf91 (diff) | |
When data are written out in very small blocks (less than 3 bytes in
size) through the base64 filter, b64_write() messes up it's parameters
in such a way that instead of writing correct base64 output, the first
4 characters of that output is repeated over and over. This fix
corrects that problem.
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/bio_b64.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/crypto/evp/bio_b64.c b/crypto/evp/bio_b64.c index 35c514a771..af6fa2ae8f 100644 --- a/crypto/evp/bio_b64.c +++ b/crypto/evp/bio_b64.c @@ -370,10 +370,11 @@ static int b64_write(BIO *b, const char *in, int inl) n-=i; } /* at this point all pending data has been written */ + ctx->buf_off=0; + ctx->buf_len=0; if ((in == NULL) || (inl <= 0)) return(0); - ctx->buf_off=0; while (inl > 0) { n=(inl > B64_BLOCK_SIZE)?B64_BLOCK_SIZE:inl; @@ -383,14 +384,20 @@ static int b64_write(BIO *b, const char *in, int inl) if (ctx->tmp_len > 0) { n=3-ctx->tmp_len; + /* There's a teoretical possibility for this */ + if (n > inl) + n=inl; memcpy(&(ctx->tmp[ctx->tmp_len]),in,n); ctx->tmp_len+=n; - n=ctx->tmp_len; - if (n < 3) + if (ctx->tmp_len < 3) break; ctx->buf_len=EVP_EncodeBlock( (unsigned char *)ctx->buf, - (unsigned char *)ctx->tmp,n); + (unsigned char *)ctx->tmp, + ctx->tmp_len); + /* Since we're now done using the temporary + buffer, the length should be 0'd */ + ctx->tmp_len=0; } else { |