openssl-1.0.0e: resolve conflicts

1 files changed, 4 insertions, 0 deletions

diff --git a/src/lib/libssl/bio_ssl.c b/src/lib/libssl/bio_ssl.c
index af319af302..eedac8a3fc 100644
--- a/src/lib/libssl/bio_ssl.c
+++ b/src/lib/libssl/bio_ssl.c
@@ -348,7 +348,11 @@ static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
                 break;
         case BIO_C_SET_SSL:
                 if (ssl != NULL)
+                        {
                         ssl_free(b);
+                        if (!ssl_new(b))
+                                return 0;
+                        }
                 b->shutdown=(int)num;
                 ssl=(SSL *)ptr;
                 ((BIO_SSL *)b->ptr)->ssl=ssl;