Bugfixes provided by "Stephen Hinton" <shinton@netopia.com>.

diff --git a/CHANGES b/CHANGES
index 9d1ce8d0c5bcb8d6bbf1a1045879d43201d75a21..835635980c0a8c1c166aa820b49d83cd686ccc21 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,10 @@
 
  Changes between 0.9.6b and 0.9.6c  [XX xxx XXXX]
 
+  *) Fix buggy behaviour of BIO_get_num_renegotiates() and BIO_ctrl()
+     for BIO_C_GET_WRITE_BUF_SIZE ("Stephen Hinton" <shinton@netopia.com>).
+     [Lutz Jaenicke]
+
   *) Rework the configuration and shared library support for Tru64 Unix.
      The configuration part makes use of modern compiler features and
      still retains old compiler behavior for those that run older versions

diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index 97003b503c6669e5241c830e76e007c9990f7841..edc6cc8715c4480c626348023f0c0d3d888e560a 100644 (file)
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -431,7 +431,7 @@ int BIO_read_filename(BIO *b,const char *name);
 #define BIO_set_ssl_renegotiate_bytes(b,num) \
        BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_BYTES,num,NULL);
 #define BIO_get_num_renegotiates(b) \
-       BIO_ctrl(b,BIO_C_SET_SSL_NUM_RENEGOTIATES,0,NULL);
+       BIO_ctrl(b,BIO_C_GET_SSL_NUM_RENEGOTIATES,0,NULL);
 #define BIO_set_ssl_renegotiate_timeout(b,seconds) \
        BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT,seconds,NULL);
 

diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
index 78c6ab4fdd97ec2af93188ac69b6df04af9c0de3..4614ad44dd1a398e7fa8b2e220672edff279e6ac 100644 (file)
--- a/crypto/bio/bss_bio.c
+++ b/crypto/bio/bss_bio.c
@@ -474,7 +474,8 @@ static long bio_ctrl(BIO *bio, int cmd, long num, void *ptr)
                break;
 
        case BIO_C_GET_WRITE_BUF_SIZE:
-               num = (long) b->size;
+               ret = (long) b->size;
+               break;
 
        case BIO_C_MAKE_BIO_PAIR:
                {