From 95f9cfcde07080a4ebcd07c8297012c1ec5b2467 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Sun, 23 Nov 2014 00:19:49 -0500 Subject: [PATCH] unifdef OPENSSL_NO_BIO. Get that out of the way. Change-Id: Ia61f47f1e23595a1d4876a85ae7518f11f4ab6a0 Reviewed-on: https://boringssl-review.googlesource.com/2401 Reviewed-by: Adam Langley --- include/openssl/asn1.h | 8 -------- include/openssl/pem.h | 11 ----------- include/openssl/ssl.h | 11 +---------- include/openssl/x509.h | 4 ---- 4 files changed, 1 insertion(+), 33 deletions(-) diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h index 752100e37..9c606c074 100644 --- a/include/openssl/asn1.h +++ b/include/openssl/asn1.h @@ -63,9 +63,7 @@ #include -#ifndef OPENSSL_NO_BIO #include -#endif #include #include @@ -778,9 +776,7 @@ OPENSSL_EXPORT int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value OPENSSL_EXPORT int ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n); OPENSSL_EXPORT int ASN1_BIT_STRING_check(ASN1_BIT_STRING *a, unsigned char *flags, int flags_len); -#ifndef OPENSSL_NO_BIO OPENSSL_EXPORT int ASN1_BIT_STRING_name_print(BIO *out, ASN1_BIT_STRING *bs, BIT_STRING_BITNAME *tbl, int indent); -#endif OPENSSL_EXPORT int ASN1_BIT_STRING_num_asc(char *name, BIT_STRING_BITNAME *tbl); OPENSSL_EXPORT int ASN1_BIT_STRING_set_asc(ASN1_BIT_STRING *bs, char *name, int value, BIT_STRING_BITNAME *tbl); @@ -852,7 +848,6 @@ OPENSSL_EXPORT STACK_OF(OPENSSL_BLOCK) *d2i_ASN1_SET(STACK_OF(OPENSSL_BLOCK) **a void (*free_func)(OPENSSL_BLOCK), int ex_tag, int ex_class); -#ifndef OPENSSL_NO_BIO OPENSSL_EXPORT int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a); OPENSSL_EXPORT int a2i_ASN1_INTEGER(BIO *bp,ASN1_INTEGER *bs,char *buf,int size); OPENSSL_EXPORT int i2a_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *a); @@ -860,7 +855,6 @@ OPENSSL_EXPORT int a2i_ASN1_ENUMERATED(BIO *bp,ASN1_ENUMERATED *bs,char *buf,int OPENSSL_EXPORT int i2a_ASN1_OBJECT(BIO *bp,ASN1_OBJECT *a); OPENSSL_EXPORT int a2i_ASN1_STRING(BIO *bp,ASN1_STRING *bs,char *buf,int size); OPENSSL_EXPORT int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type); -#endif OPENSSL_EXPORT int i2t_ASN1_OBJECT(char *buf,int buf_len,ASN1_OBJECT *a); OPENSSL_EXPORT int a2d_ASN1_OBJECT(unsigned char *out,int olen, const char *buf, int num); @@ -947,7 +941,6 @@ OPENSSL_EXPORT int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned OPENSSL_EXPORT int ASN1_STRING_to_UTF8(unsigned char **out, ASN1_STRING *in); -#ifndef OPENSSL_NO_BIO OPENSSL_EXPORT void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x); #define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \ @@ -978,7 +971,6 @@ OPENSSL_EXPORT int ASN1_STRING_print_ex(BIO *out, ASN1_STRING *str, unsigned lon OPENSSL_EXPORT int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num, unsigned char *buf, int off); OPENSSL_EXPORT int ASN1_parse(BIO *bp,const unsigned char *pp,long len,int indent); OPENSSL_EXPORT int ASN1_parse_dump(BIO *bp,const unsigned char *pp,long len,int indent,int dump); -#endif OPENSSL_EXPORT const char *ASN1_tag2str(int tag); /* Used to load and write netscape format cert */ diff --git a/include/openssl/pem.h b/include/openssl/pem.h index c18ceddac..5f61cab86 100644 --- a/include/openssl/pem.h +++ b/include/openssl/pem.h @@ -339,7 +339,6 @@ OPENSSL_EXPORT int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, #endif -#ifndef OPENSSL_NO_BIO #define DECLARE_PEM_read_bio(name, type) \ OPENSSL_EXPORT type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u); @@ -353,14 +352,6 @@ OPENSSL_EXPORT int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, OPENSSL_EXPORT int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ unsigned char *kstr, int klen, pem_password_cb *cb, void *u); -#else - -#define DECLARE_PEM_read_bio(name, type) /**/ -#define DECLARE_PEM_write_bio(name, type) /**/ -#define DECLARE_PEM_write_bio_const(name, type) /**/ -#define DECLARE_PEM_write_cb_bio(name, type) /**/ - -#endif #define DECLARE_PEM_write(name, type) \ DECLARE_PEM_write_bio(name, type) \ @@ -401,7 +392,6 @@ typedef int pem_password_cb(char *buf, int size, int rwflag); OPENSSL_EXPORT int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher); OPENSSL_EXPORT int PEM_do_header (EVP_CIPHER_INFO *cipher, unsigned char *data,long *len, pem_password_cb *callback,void *u); -#ifndef OPENSSL_NO_BIO OPENSSL_EXPORT int PEM_read_bio(BIO *bp, char **name, char **header, unsigned char **data,long *len); OPENSSL_EXPORT int PEM_write_bio(BIO *bp,const char *name, const char *hdr, const unsigned char *data, long len); OPENSSL_EXPORT int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm, const char *name, BIO *bp, pem_password_cb *cb, void *u); @@ -410,7 +400,6 @@ OPENSSL_EXPORT int PEM_ASN1_write_bio(i2d_of_void *i2d,const char *name,BIO *bp, OPENSSL_EXPORT STACK_OF(X509_INFO) * PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u); OPENSSL_EXPORT int PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc, unsigned char *kstr, int klen, pem_password_cb *cd, void *u); -#endif OPENSSL_EXPORT int PEM_read(FILE *fp, char **name, char **header, unsigned char **data,long *len); OPENSSL_EXPORT int PEM_write(FILE *fp, const char *name, const char *hdr, const unsigned char *data, long len); diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 72b19b94e..2132fd1de 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1170,16 +1170,11 @@ struct ssl_st * same. This is so data can be read and written to different * handlers */ -#ifndef OPENSSL_NO_BIO BIO *rbio; /* used by SSL_read */ BIO *wbio; /* used by SSL_write */ BIO *bbio; /* used during session-id reuse to concatenate * messages */ -#else - char *rbio; /* used by SSL_read */ - char *wbio; /* used by SSL_write */ - char *bbio; -#endif + /* This holds a variable that indicates what we were doing * when a 0 or -1 is returned. This is needed for * non-blocking IO so we know what request needs re-doing when @@ -1847,11 +1842,9 @@ OPENSSL_EXPORT int SSL_set_fd(SSL *s, int fd); OPENSSL_EXPORT int SSL_set_rfd(SSL *s, int fd); OPENSSL_EXPORT int SSL_set_wfd(SSL *s, int fd); #endif -#ifndef OPENSSL_NO_BIO OPENSSL_EXPORT void SSL_set_bio(SSL *s, BIO *rbio,BIO *wbio); OPENSSL_EXPORT BIO * SSL_get_rbio(const SSL *s); OPENSSL_EXPORT BIO * SSL_get_wbio(const SSL *s); -#endif OPENSSL_EXPORT int SSL_set_cipher_list(SSL *s, const char *str); OPENSSL_EXPORT void SSL_set_read_ahead(SSL *s, int yes); OPENSSL_EXPORT int SSL_get_verify_mode(const SSL *s); @@ -1902,9 +1895,7 @@ OPENSSL_EXPORT const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s, uns #ifndef OPENSSL_NO_FP_API OPENSSL_EXPORT int SSL_SESSION_print_fp(FILE *fp,const SSL_SESSION *ses); #endif -#ifndef OPENSSL_NO_BIO OPENSSL_EXPORT int SSL_SESSION_print(BIO *fp,const SSL_SESSION *ses); -#endif OPENSSL_EXPORT void SSL_SESSION_free(SSL_SESSION *ses); OPENSSL_EXPORT int SSL_set_session(SSL *to, SSL_SESSION *session); OPENSSL_EXPORT int SSL_CTX_add_session(SSL_CTX *s, SSL_SESSION *c); diff --git a/include/openssl/x509.h b/include/openssl/x509.h index 8950984fe..d9c2ae135 100644 --- a/include/openssl/x509.h +++ b/include/openssl/x509.h @@ -676,7 +676,6 @@ OPENSSL_EXPORT int i2d_PUBKEY_fp(FILE *fp, EVP_PKEY *pkey); OPENSSL_EXPORT EVP_PKEY *d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a); #endif -#ifndef OPENSSL_NO_BIO OPENSSL_EXPORT X509 *d2i_X509_bio(BIO *bp,X509 **x509); OPENSSL_EXPORT int i2d_X509_bio(BIO *bp,X509 *x509); OPENSSL_EXPORT X509_CRL *d2i_X509_CRL_bio(BIO *bp,X509_CRL **crl); @@ -709,7 +708,6 @@ OPENSSL_EXPORT int i2d_PrivateKey_bio(BIO *bp, EVP_PKEY *pkey); OPENSSL_EXPORT EVP_PKEY *d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a); OPENSSL_EXPORT int i2d_PUBKEY_bio(BIO *bp, EVP_PKEY *pkey); OPENSSL_EXPORT EVP_PKEY *d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a); -#endif OPENSSL_EXPORT X509 *X509_dup(X509 *x509); OPENSSL_EXPORT X509_ATTRIBUTE *X509_ATTRIBUTE_dup(X509_ATTRIBUTE *xa); @@ -948,7 +946,6 @@ OPENSSL_EXPORT int X509_REQ_print_fp(FILE *bp,X509_REQ *req); OPENSSL_EXPORT int X509_NAME_print_ex_fp(FILE *fp, X509_NAME *nm, int indent, unsigned long flags); #endif -#ifndef OPENSSL_NO_BIO OPENSSL_EXPORT int X509_NAME_print(BIO *bp, X509_NAME *name, int obase); OPENSSL_EXPORT int X509_NAME_print_ex(BIO *out, X509_NAME *nm, int indent, unsigned long flags); OPENSSL_EXPORT int X509_print_ex(BIO *bp,X509 *x, unsigned long nmflag, unsigned long cflag); @@ -958,7 +955,6 @@ OPENSSL_EXPORT int X509_CERT_AUX_print(BIO *bp,X509_CERT_AUX *x, int indent); OPENSSL_EXPORT int X509_CRL_print(BIO *bp,X509_CRL *x); OPENSSL_EXPORT int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflag, unsigned long cflag); OPENSSL_EXPORT int X509_REQ_print(BIO *bp,X509_REQ *req); -#endif OPENSSL_EXPORT int X509_NAME_entry_count(X509_NAME *name); OPENSSL_EXPORT int X509_NAME_get_text_by_NID(X509_NAME *name, int nid,