diff options
| author | Kenny Root <kroot@google.com> | 2015-09-25 02:29:14 +0000 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-09-25 02:29:14 +0000 |
| commit | b8494591d1b1a143f3b192d845c238bbf3bc629d (patch) | |
| tree | dd743d9d64af3145fe96b8d5fc2f3427544794bd /src/include/openssl/base64.h | |
| parent | a04d78d392463df4e69a64360c952ffa5abd22f7 (diff) | |
| download | external_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.zip external_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.tar.gz external_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.tar.bz2 | |
Revert "Revert "external/boringssl: sync with upstream.""
This reverts commit a04d78d392463df4e69a64360c952ffa5abd22f7.
Underlying issue was fixed.
Change-Id: I49685b653d16e728eb38e79e02b2c33ddeefed88
Diffstat (limited to 'src/include/openssl/base64.h')
| -rw-r--r-- | src/include/openssl/base64.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/include/openssl/base64.h b/src/include/openssl/base64.h index 7aee990..2d27c89 100644 --- a/src/include/openssl/base64.h +++ b/src/include/openssl/base64.h @@ -148,9 +148,11 @@ OPENSSL_EXPORT int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, uint8_t *out, OPENSSL_EXPORT int EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, uint8_t *out, int *out_len); -/* Deprecated: EVP_DecodeBlock encodes |src_len| bytes from |src| and - * writes the result to |dst|. It returns the number of bytes written - * or -1 on error. + +/* Deprecated functions. */ + +/* EVP_DecodeBlock encodes |src_len| bytes from |src| and writes the result to + * |dst|. It returns the number of bytes written or -1 on error. * * WARNING: EVP_DecodeBlock's return value does not take padding into * account. It also strips leading whitespace and trailing |