Commit 9982cbbb authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

Remove BIO_s_file_internal macro. 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 57e4e926

crypto/x509/by_file.c

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type) 


    if (file == NULL)

        return (1);

    in = BIO_new(BIO_s_file_internal());

    in = BIO_new(BIO_s_file());



    if ((in == NULL) || (BIO_read_filename(in, file) <= 0)) {

        X509err(X509_F_X509_LOAD_CERT_FILE, ERR_R_SYS_LIB);
@@ -186,7 +186,7 @@ int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type) 


    if (file == NULL)

        return (1);

    in = BIO_new(BIO_s_file_internal());

    in = BIO_new(BIO_s_file());



    if ((in == NULL) || (BIO_read_filename(in, file) <= 0)) {

        X509err(X509_F_X509_LOAD_CRL_FILE, ERR_R_SYS_LIB);

include/openssl/bio.h

+0 −1
Original line number Diff line number Diff line
@@ -635,7 +635,6 @@ int BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix, 


BIO_METHOD *BIO_s_file(void);

BIO *BIO_new_file(const char *filename, const char *mode);

# define BIO_s_file_internal    BIO_s_file

# ifndef OPENSSL_NO_STDIO

BIO *BIO_new_fp(FILE *stream, int close_flag);

# endif

ssl/ssl_cert.c

+2 −2
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file) 


    sk = sk_X509_NAME_new(xname_cmp);



    in = BIO_new(BIO_s_file_internal());

    in = BIO_new(BIO_s_file());



    if ((sk == NULL) || (in == NULL)) {

        SSLerr(SSL_F_SSL_LOAD_CLIENT_CA_FILE, ERR_R_MALLOC_FAILURE);
@@ -756,7 +756,7 @@ int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack, 


    oldcmp = sk_X509_NAME_set_cmp_func(stack, xname_cmp);



    in = BIO_new(BIO_s_file_internal());

    in = BIO_new(BIO_s_file());



    if (in == NULL) {

        SSLerr(SSL_F_SSL_ADD_FILE_CERT_SUBJECTS_TO_STACK,

ssl/ssl_conf.c

+1 −1
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ static int cmd_DHParameters(SSL_CONF_CTX *cctx, const char *value) 
    DH *dh = NULL;

    BIO *in = NULL;

    if (cctx->ctx || cctx->ssl) {

        in = BIO_new(BIO_s_file_internal());

        in = BIO_new(BIO_s_file());

        if (!in)

            goto end;

        if (BIO_read_filename(in, value) <= 0)

ssl/ssl_rsa.c

+8 −8
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ int SSL_use_certificate_file(SSL *ssl, const char *file, int type) 
    int ret = 0;

    X509 *x = NULL;



    in = BIO_new(BIO_s_file_internal());

    in = BIO_new(BIO_s_file());

    if (in == NULL) {

        SSLerr(SSL_F_SSL_USE_CERTIFICATE_FILE, ERR_R_BUF_LIB);

        goto end;
@@ -227,7 +227,7 @@ int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type) 
    BIO *in;

    RSA *rsa = NULL;



    in = BIO_new(BIO_s_file_internal());

    in = BIO_new(BIO_s_file());

    if (in == NULL) {

        SSLerr(SSL_F_SSL_USE_RSAPRIVATEKEY_FILE, ERR_R_BUF_LIB);

        goto end;
@@ -299,7 +299,7 @@ int SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type) 
    BIO *in;

    EVP_PKEY *pkey = NULL;



    in = BIO_new(BIO_s_file_internal());

    in = BIO_new(BIO_s_file());

    if (in == NULL) {

        SSLerr(SSL_F_SSL_USE_PRIVATEKEY_FILE, ERR_R_BUF_LIB);

        goto end;
@@ -430,7 +430,7 @@ int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type) 
    int ret = 0;

    X509 *x = NULL;



    in = BIO_new(BIO_s_file_internal());

    in = BIO_new(BIO_s_file());

    if (in == NULL) {

        SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE, ERR_R_BUF_LIB);

        goto end;
@@ -512,7 +512,7 @@ int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type) 
    BIO *in;

    RSA *rsa = NULL;



    in = BIO_new(BIO_s_file_internal());

    in = BIO_new(BIO_s_file());

    if (in == NULL) {

        SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE, ERR_R_BUF_LIB);

        goto end;
@@ -581,7 +581,7 @@ int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type) 
    BIO *in;

    EVP_PKEY *pkey = NULL;



    in = BIO_new(BIO_s_file_internal());

    in = BIO_new(BIO_s_file());

    if (in == NULL) {

        SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY_FILE, ERR_R_BUF_LIB);

        goto end;
@@ -648,7 +648,7 @@ static int use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl, const char *file) 
    ERR_clear_error();          /* clear error stack for

                                 * SSL_CTX_use_certificate() */



    in = BIO_new(BIO_s_file_internal());

    in = BIO_new(BIO_s_file());

    if (in == NULL) {

        SSLerr(SSL_F_USE_CERTIFICATE_CHAIN_FILE, ERR_R_BUF_LIB);

        goto end;
@@ -930,7 +930,7 @@ int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file) 
        goto end;

    }



    bin = BIO_new(BIO_s_file_internal());

    bin = BIO_new(BIO_s_file());

    if (bin == NULL) {

        SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, ERR_R_BUF_LIB);

        goto end;