[openssl-commits] [openssl] master update

[Viktor Dukhovni]

The branch master has been updated
       via  e64b5557814e2c9eb1aca111936cb8ac151dfceb (commit)
      from  f75b34c8c81d7277fa002120d4c8dc36c39d1ff5 (commit)


- Log -----------------------------------------------------------------
commit e64b5557814e2c9eb1aca111936cb8ac151dfceb
Author: Ben Laurie <ben at links.org>
Date:   Wed May 18 17:20:07 2016 +0100

    ok was uninitialised on failure.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/objects/obj_dat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 820c275..3b836fe 100644
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -680,7 +680,7 @@ int OBJ_create_objects(BIO *in)
 int OBJ_create(const char *oid, const char *sn, const char *ln)
 {
     ASN1_OBJECT *tmpoid = NULL;
-    int ok;
+    int ok = 0;
 
     /* Check to see if short or long name already present */
     if (OBJ_sn2nid(sn) != NID_undef || OBJ_ln2nid(ln) != NID_undef) {