diff options
| author | Matt Braithwaite <mab@google.com> | 2015-06-17 15:17:19 -0700 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2015-10-08 03:04:30 -0700 |
| commit | c51c1b8274193691341fe206907412508cbfc14f (patch) | |
| tree | 223c4892fa927d51fb276668536d3b7f363d3af7 /src | |
| parent | 8ee7c56cd93598497fd13c7b32d88d0bf4a1ef76 (diff) | |
| download | external_boringssl-c51c1b8274193691341fe206907412508cbfc14f.zip external_boringssl-c51c1b8274193691341fe206907412508cbfc14f.tar.gz external_boringssl-c51c1b8274193691341fe206907412508cbfc14f.tar.bz2 | |
Restore |BIO_f_base64| from OpenSSL at b4f0d1a, modulo style fixes.
Change-Id: Ia7f4f4f6d063d882cf3d3ac0f5f33ad8d8cd9875
Reviewed-on: https://boringssl-review.googlesource.com/5151
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/decrepit/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/include/openssl/bio.h | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/decrepit/CMakeLists.txt b/src/decrepit/CMakeLists.txt index b43fea7..a486c1b 100644 --- a/src/decrepit/CMakeLists.txt +++ b/src/decrepit/CMakeLists.txt @@ -1,9 +1,11 @@ add_subdirectory(cast) add_subdirectory(blowfish) +add_subdirectory(bio) add_library( decrepit - $<TARGET_OBJECTS:cast> + $<TARGET_OBJECTS:bio_decrepit> $<TARGET_OBJECTS:blowfish> + $<TARGET_OBJECTS:cast> ) diff --git a/src/include/openssl/bio.h b/src/include/openssl/bio.h index 8724657..18dfaa4 100644 --- a/src/include/openssl/bio.h +++ b/src/include/openssl/bio.h @@ -727,6 +727,15 @@ OPENSSL_EXPORT int BIO_zero_copy_get_write_buf_done(BIO* bio, #define BIO_print_errors_fp ERR_print_errors_fp +/* Deprecated functions. */ + +/* Returns a filter |BIO| that base64-encodes data written into it, and decodes + * data read from it. |BIO_gets| is not supported. Call |BIO_flush| when done + * writing, to signal that no more data are to be encoded. The flag + * |BIO_FLAGS_BASE64_NO_NL| may be set to encode all the data on one line. */ +OPENSSL_EXPORT const BIO_METHOD *BIO_f_base64(void); + + /* Private functions */ #define BIO_FLAGS_READ 0x01 |