external/boringssl: Sync to f21650709a6f76e829ddcc77fe221c9d6a5c12de.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/348f0d8db9c2a0eca0503ba654020209c579d552..f21650709a6f76e829ddcc77fe221c9d6a5c12de
Test: BoringSSL CTS Presubmits.
Change-Id: Ie6e99c3315c552068b5ea57e31b1af7ff94f9b0f
diff --git a/src/decrepit/bio/base64_bio.c b/src/decrepit/bio/base64_bio.c
index eef4e1a..139d562 100644
--- a/src/decrepit/bio/base64_bio.c
+++ b/src/decrepit/bio/base64_bio.c
@@ -78,11 +78,11 @@
typedef struct b64_struct {
int buf_len;
int buf_off;
- int tmp_len; /* used to find the start when decoding */
- int tmp_nl; /* If true, scan until '\n' */
+ int tmp_len; // used to find the start when decoding
+ int tmp_nl; // If true, scan until '\n'
int encode;
- int start; /* have we started decoding yet? */
- int cont; /* <= 0 when finished */
+ int start; // have we started decoding yet?
+ int cont; // <= 0 when finished
EVP_ENCODE_CTX base64;
char buf[EVP_ENCODE_LENGTH(B64_BLOCK_SIZE) + 10];
char tmp[B64_BLOCK_SIZE];
@@ -141,7 +141,7 @@
EVP_DecodeInit(&ctx->base64);
}
- /* First check if there are bytes decoded/encoded */
+ // First check if there are bytes decoded/encoded
if (ctx->buf_len > 0) {
assert(ctx->buf_len >= ctx->buf_off);
i = ctx->buf_len - ctx->buf_off;
@@ -160,8 +160,8 @@
}
}
- /* At this point, we have room of outl bytes and an empty buffer, so we
- * should read in some more. */
+ // At this point, we have room of outl bytes and an empty buffer, so we
+ // should read in some more.
ret_code = 0;
while (outl > 0) {
@@ -175,28 +175,28 @@
if (i <= 0) {
ret_code = i;
- /* Should we continue next time we are called? */
+ // Should we continue next time we are called?
if (!BIO_should_retry(b->next_bio)) {
ctx->cont = i;
- /* If buffer empty break */
+ // If buffer empty break
if (ctx->tmp_len == 0) {
break;
} else {
- /* Fall through and process what we have */
+ // Fall through and process what we have
i = 0;
}
} else {
- /* else we retry and add more data to buffer */
+ // else we retry and add more data to buffer
break;
}
}
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.
if (ctx->start && (BIO_test_flags(b, BIO_FLAGS_BASE64_NO_NL))) {
- /* ctx->start = 1; */
+ // ctx->start = 1;
ctx->tmp_len = 0;
} else if (ctx->start) {
q = p = (uint8_t *)ctx->tmp;
@@ -206,8 +206,8 @@
continue;
}
- /* due to a previous very long line, we need to keep on scanning for a
- * '\n' before we even start looking for base64 encoded stuff. */
+ // due to a previous very long line, we need to keep on scanning for a
+ // '\n' before we even start looking for base64 encoded stuff.
if (ctx->tmp_nl) {
p = q;
ctx->tmp_nl = 0;
@@ -233,38 +233,38 @@
p = q;
}
- /* we fell off the end without starting */
+ // we fell off the end without starting
if (j == i && num == 0) {
- /* Is this is one long chunk?, if so, keep on reading until a new
- * line. */
+ // Is this is one long chunk?, if so, keep on reading until a new
+ // line.
if (p == (uint8_t *)&(ctx->tmp[0])) {
- /* Check buffer full */
+ // 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'
n = q - p;
for (ii = 0; ii < n; ii++) {
ctx->tmp[ii] = p[ii];
}
ctx->tmp_len = n;
}
- /* else finished on a '\n' */
+ // else finished on a '\n'
continue;
} else {
ctx->tmp_len = 0;
}
} else if (i < B64_BLOCK_SIZE && ctx->cont > 0) {
- /* If buffer isn't full and we can retry then restart to read in more
- * data. */
+ // If buffer isn't full and we can retry then restart to read in more
+ // data.
continue;
}
if (BIO_test_flags(b, BIO_FLAGS_BASE64_NO_NL)) {
int z, jj;
- jj = i & ~3; /* process per 4 */
+ jj = i & ~3; // process per 4
z = EVP_DecodeBlock((uint8_t *)ctx->buf, (uint8_t *)ctx->tmp, jj);
if (jj > 2) {
if (ctx->tmp[jj - 1] == '=') {
@@ -274,7 +274,7 @@
}
}
}
- /* z is now number of output bytes and jj is the number consumed. */
+ // z is now number of output bytes and jj is the number consumed.
if (jj != i) {
OPENSSL_memmove(ctx->tmp, &ctx->tmp[jj], i - jj);
ctx->tmp_len = i - jj;
@@ -350,7 +350,7 @@
n -= i;
}
- /* at this point all pending data has been written. */
+ // at this point all pending data has been written.
ctx->buf_off = 0;
ctx->buf_len = 0;
@@ -365,7 +365,7 @@
if (ctx->tmp_len > 0) {
assert(ctx->tmp_len <= 3);
n = 3 - ctx->tmp_len;
- /* There's a theoretical possibility of this. */
+ // There's a theoretical possibility of this.
if (n > inl) {
n = inl;
}
@@ -380,8 +380,8 @@
assert(ctx->buf_len <= (int)sizeof(ctx->buf));
assert(ctx->buf_len >= ctx->buf_off);
- /* Since we're now done using the temporary buffer, the length should
- * be zeroed. */
+ // Since we're now done using the temporary buffer, the length should
+ // be zeroed.
ctx->tmp_len = 0;
} else {
if (n < 3) {
@@ -443,7 +443,7 @@
ret = BIO_ctrl(b->next_bio, cmd, num, ptr);
break;
- case BIO_CTRL_EOF: /* More to read */
+ case BIO_CTRL_EOF: // More to read
if (ctx->cont <= 0) {
ret = 1;
} else {
@@ -451,7 +451,7 @@
}
break;
- case BIO_CTRL_WPENDING: /* More to write in buffer */
+ case BIO_CTRL_WPENDING: // More to write in buffer
assert(ctx->buf_len >= ctx->buf_off);
ret = ctx->buf_len - ctx->buf_off;
if ((ret == 0) && (ctx->encode != B64_NONE) && (ctx->base64.data_used != 0)) {
@@ -461,7 +461,7 @@
}
break;
- case BIO_CTRL_PENDING: /* More to read in buffer */
+ case BIO_CTRL_PENDING: // More to read in buffer
assert(ctx->buf_len >= ctx->buf_off);
ret = ctx->buf_len - ctx->buf_off;
if (ret <= 0) {
@@ -470,7 +470,7 @@
break;
case BIO_CTRL_FLUSH:
- /* do a final write */
+ // do a final write
again:
while (ctx->buf_len != ctx->buf_off) {
i = b64_write(b, NULL, 0);
@@ -489,10 +489,10 @@
} else if (ctx->encode != B64_NONE && ctx->base64.data_used != 0) {
ctx->buf_off = 0;
EVP_EncodeFinal(&(ctx->base64), (uint8_t *)ctx->buf, &(ctx->buf_len));
- /* push out the bytes */
+ // push out the bytes
goto again;
}
- /* Finally flush the underlying BIO */
+ // Finally flush the underlying BIO
ret = BIO_ctrl(b->next_bio, cmd, num, ptr);
break;