From bbc7859817e9e6d1fee989d7ded5d5836d7efded Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Fri, 3 Jun 2016 16:56:32 -0400 Subject: [PATCH] Match OpenSSL's values for BIO_CTRL_*. The fake numbers collide with other numbers defined below. Also PUSH and POP are actually used. DUP legitimately isn't though. Change-Id: Iaa15a065d846b89b9b7958b78068393cfee2bd6f Reviewed-on: https://boringssl-review.googlesource.com/8143 Reviewed-by: Steven Valdez Reviewed-by: David Benjamin --- include/openssl/bio.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/openssl/bio.h b/include/openssl/bio.h index b25a31f3..df41f0f8 100644 --- a/include/openssl/bio.h +++ b/include/openssl/bio.h @@ -714,6 +714,8 @@ OPENSSL_EXPORT int BIO_zero_copy_get_write_buf_done(BIO* bio, #define BIO_CTRL_INFO 3 /* opt - extra tit-bits */ #define BIO_CTRL_SET 4 /* man - set the 'IO' type */ #define BIO_CTRL_GET 5 /* man - get the 'IO' type */ +#define BIO_CTRL_PUSH 6 +#define BIO_CTRL_POP 7 #define BIO_CTRL_GET_CLOSE 8 /* man - set the 'close' on free */ #define BIO_CTRL_SET_CLOSE 9 /* man - set the 'close' on free */ #define BIO_CTRL_PENDING 10 /* opt - is their more data buffered */ @@ -724,10 +726,8 @@ OPENSSL_EXPORT int BIO_zero_copy_get_write_buf_done(BIO* bio, #define BIO_CTRL_GET_CALLBACK 15 /* opt - set callback function */ #define BIO_CTRL_SET_FILENAME 30 /* BIO_s_file special */ -/* These are never used, but exist to allow code to compile more easily. */ -#define BIO_CTRL_DUP 100 -#define BIO_CTRL_PUSH 101 -#define BIO_CTRL_POP 102 +/* BIO_CTRL_DUP is never used, but exists to allow code to compile more easily. */ +#define BIO_CTRL_DUP 12 /* Android compatibility section.