openssl-1.0.0e: resolve conflicts

2 files changed, 3 insertions, 13 deletions

diff --git a/src/lib/libcrypto/conf/conf_api.c b/src/lib/libcrypto/conf/conf_api.c
index 22617e5fa1..f5fcbb9f6b 100644
--- a/src/lib/libcrypto/conf/conf_api.c
+++ b/src/lib/libcrypto/conf/conf_api.c
@@ -64,6 +64,7 @@
 #endif
 
 #include <assert.h>
+#include <stdlib.h>
 #include <string.h>
 #include <openssl/conf.h>
 #include <openssl/conf_api.h>
@@ -285,7 +286,7 @@ CONF_VALUE *_CONF_new_section(CONF *conf, const char *section)
         v->value=(char *)sk;
         
         vv=lh_CONF_VALUE_insert(conf->data,v);
-        assert(vv == NULL);
+        OPENSSL_assert(vv == NULL);
         ok=1;
 err:
         if (!ok)
diff --git a/src/lib/libcrypto/conf/conf_def.c b/src/lib/libcrypto/conf/conf_def.c
index 0b571b0394..cf951320af 100644
--- a/src/lib/libcrypto/conf/conf_def.c
+++ b/src/lib/libcrypto/conf/conf_def.c
@@ -213,13 +213,12 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
         int bufnum=0,i,ii;
         BUF_MEM *buff=NULL;
         char *s,*p,*end;
-        int again,n;
+        int again;
         long eline=0;
         char btmp[DECIMAL_SIZE(eline)+1];
         CONF_VALUE *v=NULL,*tv;
         CONF_VALUE *sv=NULL;
         char *section=NULL,*buf;
-        STACK_OF(CONF_VALUE) *section_sk=NULL,*ts;
         char *start,*psection,*pname;
         void *h = (void *)(conf->data);
 
@@ -250,7 +249,6 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
                                         CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
                 goto err;
                 }
-        section_sk=(STACK_OF(CONF_VALUE) *)sv->value;
 
         bufnum=0;
         again=0;
@@ -309,7 +307,6 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
                 buf=buff->data;
 
                 clear_comments(conf, buf);
-                n=strlen(buf);
                 s=eat_ws(conf, buf);
                 if (IS_EOF(conf,*s)) continue; /* blank line */
                 if (*s == '[')
@@ -343,7 +340,6 @@ again:
                                         CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
                                 goto err;
                                 }
-                        section_sk=(STACK_OF(CONF_VALUE) *)sv->value;
                         continue;
                         }
                 else
@@ -406,13 +402,9 @@ again:
                                            CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
                                         goto err;
                                         }
-                                ts=(STACK_OF(CONF_VALUE) *)tv->value;
                                 }
                         else
-                                {
                                 tv=sv;
-                                ts=section_sk;
-                                }
 #if 1
                         if (_CONF_add_string(conf, tv, v) == 0)
                                 {
@@ -465,9 +457,6 @@ err:
 
 static void clear_comments(CONF *conf, char *p)
         {
-        char *to;
-
-        to=p;
         for (;;)
                 {
                 if (IS_FCOMMENT(conf,*p))