Use poll() when possible to gather Unix randomness entropy

[openssl.git] / ssl / bio_ssl.c

diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
index 1db216be8bd9e3f5ee7bc68e280c7d310bccdc74..da6dfd2262649de84bf469e9e40908022f68d95c 100644 (file)
--- a/ssl/bio_ssl.c
+++ b/ssl/bio_ssl.c
@@ -456,7 +456,7 @@ static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
        case BIO_CTRL_SET_CALLBACK:
                {
 #if 0 /* FIXME: Should this be used?  -- Richard Levitte */
-               BIOerr(SSL_F_SSL_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+               SSLerr(SSL_F_SSL_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
                ret = -1;
 #else
                ret=0;
@@ -465,9 +465,9 @@ static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
                break;
        case BIO_CTRL_GET_CALLBACK:
                {
-               void (**fptr)(const SSL *ssl,int type,int val);
+               void (**fptr)(const SSL *xssl,int type,int val);
 
-               fptr=(void (**)(const SSL *ssl,int type,int val))ptr;
+               fptr=(void (**)(const SSL *xssl,int type,int val))ptr;
                *fptr=SSL_get_info_callback(ssl);
                }
                break;
@@ -543,7 +543,6 @@ BIO *BIO_new_ssl_connect(SSL_CTX *ctx)
        return(ret);
 err:
        if (con != NULL) BIO_free(con);
-       if (ret != NULL) BIO_free(ret);
        return(NULL);
        }