Changeset 808 for openssl/trunk/crypto/bio/bio_lib.c

Timestamp:

Aug 7, 2014, 8:25:37 PM (11 years ago)

Author:

dmik

Message:

openssl: Merge version 1.0.0n from vendor to trunk.

Location:

openssl/trunk

Files:

• . (modified) (1 prop)
• crypto/bio/bio_lib.c (modified) (4 diffs)

openssl/trunk/crypto/bio/bio_lib.c ¶

@@ -111 +111 @@
 int BIO_free(BIO *a)
         {
-        int ret=0,i;
+        int i;
 
         if (a == NULL) return(0);
@@ -133 +133 @@
         CRYPTO_free_ex_data(CRYPTO_EX_INDEX_BIO, a, &a->ex_data);
 
-        if ((a->method == NULL) || (a->method->destroy == NULL)) return(1);
-        ret=a->method->destroy(a);
+        if ((a->method != NULL) && (a->method->destroy != NULL))
+                a->method->destroy(a);
         OPENSSL_free(a);
         return(1);
@@ -522 +522 @@
 BIO *BIO_dup_chain(BIO *in)
         {
-        BIO *ret=NULL,*eoc=NULL,*bio,*new;
+        BIO *ret=NULL,*eoc=NULL,*bio,*new_bio;
 
         for (bio=in; bio != NULL; bio=bio->next_bio)
                 {
-                if ((new=BIO_new(bio->method)) == NULL) goto err;
-                new->callback=bio->callback;
-                new->cb_arg=bio->cb_arg;
-                new->init=bio->init;
-                new->shutdown=bio->shutdown;
-                new->flags=bio->flags;
+                if ((new_bio=BIO_new(bio->method)) == NULL) goto err;
+                new_bio->callback=bio->callback;
+                new_bio->cb_arg=bio->cb_arg;
+                new_bio->init=bio->init;
+                new_bio->shutdown=bio->shutdown;
+                new_bio->flags=bio->flags;
 
                 /* This will let SSL_s_sock() work with stdin/stdout */
-                new->num=bio->num;
-
-                if (!BIO_dup_state(bio,(char *)new))
+                new_bio->num=bio->num;
+
+                if (!BIO_dup_state(bio,(char *)new_bio))
                         {
-                        BIO_free(new);
+                        BIO_free(new_bio);
                         goto err;
                         }
 
                 /* copy app data */
-                if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_BIO, &new->ex_data,
+                if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_BIO, &new_bio->ex_data,
                                         &bio->ex_data))
                         goto err;
@@ -549 +549 @@
                 if (ret == NULL)
                         {
-                        eoc=new;
+                        eoc=new_bio;
                         ret=eoc;
                         }
                 else
                         {
-                        BIO_push(eoc,new);
-                        eoc=new;
+                        BIO_push(eoc,new_bio);
+                        eoc=new_bio;
                         }
                 }