projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warnings.
[oweals/openssl.git]
/
crypto
/
evp
/
bio_b64.c
diff --git
a/crypto/evp/bio_b64.c
b/crypto/evp/bio_b64.c
index f12eac1b55a06b37a49d1d579f1b65d7edb9fca0..fa5cbc7eb1ffc68fa212a102856e092c55b6512e 100644
(file)
--- a/
crypto/evp/bio_b64.c
+++ b/
crypto/evp/bio_b64.c
@@
-165,6
+165,7
@@
static int b64_read(BIO *b, char *out, int outl)
{
i=ctx->buf_len-ctx->buf_off;
if (i > outl) i=outl;
{
i=ctx->buf_len-ctx->buf_off;
if (i > outl) i=outl;
+ OPENSSL_assert(ctx->buf_off+i < (int)sizeof(ctx->buf));
memcpy(out,&(ctx->buf[ctx->buf_off]),i);
ret=i;
out+=i;
memcpy(out,&(ctx->buf[ctx->buf_off]),i);
ret=i;
out+=i;
@@
-183,7
+184,9
@@
static int b64_read(BIO *b, char *out, int outl)
ret_code=0;
while (outl > 0)
{
ret_code=0;
while (outl > 0)
{
- if (ctx->cont <= 0) break;
+
+ if (ctx->cont <= 0)
+ break;
i=BIO_read(b->next_bio,&(ctx->tmp[ctx->tmp_len]),
B64_BLOCK_SIZE-ctx->tmp_len);
i=BIO_read(b->next_bio,&(ctx->tmp[ctx->tmp_len]),
B64_BLOCK_SIZE-ctx->tmp_len);
@@
-194,11
+197,21
@@
static int b64_read(BIO *b, char *out, int outl)
/* Should be continue next time we are called? */
if (!BIO_should_retry(b->next_bio))
/* Should be continue next time we are called? */
if (!BIO_should_retry(b->next_bio))
+ {
ctx->cont=i;
ctx->cont=i;
- /* else we should continue when called again */
- break;
+ /* If buffer empty break */
+ if(ctx->tmp_len == 0)
+ break;
+ /* Fall through and process what we have */
+ else
+ i = 0;
+ }
+ /* else we retry and add more data to buffer */
+ else
+ break;
}
i+=ctx->tmp_len;
}
i+=ctx->tmp_len;
+ ctx->tmp_len = i;
/* We need to scan, a line at a time until we
* have a valid line if we are starting. */
/* We need to scan, a line at a time until we
* have a valid line if we are starting. */
@@
-254,8
+267,12
@@
static int b64_read(BIO *b, char *out, int outl)
* reading until a new line. */
if (p == (unsigned char *)&(ctx->tmp[0]))
{
* reading until a new line. */
if (p == (unsigned char *)&(ctx->tmp[0]))
{
- ctx->tmp_nl=1;
- ctx->tmp_len=0;
+ /* Check buffer full */
+ if (i == B64_BLOCK_SIZE)
+ {
+ ctx->tmp_nl=1;
+ ctx->tmp_len=0;
+ }
}
else if (p != q) /* finished on a '\n' */
{
}
else if (p != q) /* finished on a '\n' */
{
@@
-270,6
+287,11
@@
static int b64_read(BIO *b, char *out, int outl)
else
ctx->tmp_len=0;
}
else
ctx->tmp_len=0;
}
+ /* If buffer isn't full and we can retry then
+ * restart to read in more data.
+ */
+ else if ((i < B64_BLOCK_SIZE) && (ctx->cont > 0))
+ continue;
if (BIO_get_flags(b) & BIO_FLAGS_BASE64_NO_NL)
{
if (BIO_get_flags(b) & BIO_FLAGS_BASE64_NO_NL)
{
@@
-309,8
+331,8
@@
static int b64_read(BIO *b, char *out, int outl)
i=EVP_DecodeUpdate(&(ctx->base64),
(unsigned char *)ctx->buf,&ctx->buf_len,
(unsigned char *)ctx->tmp,i);
i=EVP_DecodeUpdate(&(ctx->base64),
(unsigned char *)ctx->buf,&ctx->buf_len,
(unsigned char *)ctx->tmp,i);
+ ctx->tmp_len = 0;
}
}
- ctx->cont=i;
ctx->buf_off=0;
if (i < 0)
{
ctx->buf_off=0;
if (i < 0)
{
@@
-483,10
+505,7
@@
again:
{
i=b64_write(b,NULL,0);
if (i < 0)
{
i=b64_write(b,NULL,0);
if (i < 0)
- {
- ret=i;
- break;
- }
+ return i;
}
if (BIO_get_flags(b) & BIO_FLAGS_BASE64_NO_NL)
{
}
if (BIO_get_flags(b) & BIO_FLAGS_BASE64_NO_NL)
{