Updated libtor dependencies.

berty · Dec 22, 2020 · 1cec208 · 1cec208
1 parent b7df4b6
commit 1cec208
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ The `go-libtor` project is a self-contained, fully statically linked Tor library
 |:-:|:-:|:-:|
 | zlib | 1.2.11 | [`cacf7f1d4e3d44d871b605da3b647f07d718623f`](https://github.com/madler/zlib/commit/cacf7f1d4e3d44d871b605da3b647f07d718623f) |
 | libevent | 2.2.0-alpha-dev | [`657e180694a97c6d70d58cd60b82e43dc23ac4b2`](https://github.com/libevent/libevent/commit/657e180694a97c6d70d58cd60b82e43dc23ac4b2) |
-| openssl | 1.1.1-stable | [`5a5d87a936ceeca1648288e1efe4296687193b16`](https://github.com/openssl/openssl/commit/5a5d87a936ceeca1648288e1efe4296687193b16) |
+| openssl | 1.1.1-stable | [`64a1b940d2b640e5edf0feae90e81bbb6b4941e7`](https://github.com/openssl/openssl/commit/64a1b940d2b640e5edf0feae90e81bbb6b4941e7) |
 | tor | 0.3.5.12-dev | [`6cd23b29d262da3ecd07208804804d66550a6c9a`](https://gitweb.torproject.org/tor.git/commit/?id=6cd23b29d262da3ecd07208804804d66550a6c9a) |
 
 The library is currently supported on:

diff --git a/darwin/openssl/crypto/x509/x_attrib.c b/darwin/openssl/crypto/x509/x_attrib.c
@@ -37,10 +37,13 @@ X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, void *value)
 {
     X509_ATTRIBUTE *ret = NULL;
     ASN1_TYPE *val = NULL;
+    ASN1_OBJECT *oid;
 
+    if ((oid = OBJ_nid2obj(nid)) == NULL)
+        return NULL;
     if ((ret = X509_ATTRIBUTE_new()) == NULL)
         return NULL;
-    ret->object = OBJ_nid2obj(nid);
+    ret->object = oid;
     if ((val = ASN1_TYPE_new()) == NULL)
         goto err;
     if (!sk_ASN1_TYPE_push(ret->set, val))

diff --git a/linux/openssl/crypto/x509/x_attrib.c b/linux/openssl/crypto/x509/x_attrib.c
@@ -37,10 +37,13 @@ X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, void *value)
 {
     X509_ATTRIBUTE *ret = NULL;
     ASN1_TYPE *val = NULL;
+    ASN1_OBJECT *oid;
 
+    if ((oid = OBJ_nid2obj(nid)) == NULL)
+        return NULL;
     if ((ret = X509_ATTRIBUTE_new()) == NULL)
         return NULL;
-    ret->object = OBJ_nid2obj(nid);
+    ret->object = oid;
     if ((val = ASN1_TYPE_new()) == NULL)
         goto err;
     if (!sk_ASN1_TYPE_push(ret->set, val))

diff --git a/lock.json b/lock.json
@@ -1 +1 @@
-{"zlib":"cacf7f1d4e3d44d871b605da3b647f07d718623f","libevent":"657e180694a97c6d70d58cd60b82e43dc23ac4b2","openssl":"5a5d87a936ceeca1648288e1efe4296687193b16","tor":"6cd23b29d262da3ecd07208804804d66550a6c9a"}
+{"zlib":"cacf7f1d4e3d44d871b605da3b647f07d718623f","libevent":"657e180694a97c6d70d58cd60b82e43dc23ac4b2","openssl":"64a1b940d2b640e5edf0feae90e81bbb6b4941e7","tor":"6cd23b29d262da3ecd07208804804d66550a6c9a"}
diff --git a/openssl_config/buildinf.macos64.h b/openssl_config/buildinf.macos64.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: darwin64-x86_64-cc"
-#define DATE "built on: Sat Dec 19 03:04:29 2020 +0100"
+#define DATE "built on: Mon Dec 21 15:27:53 2020 +0100"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a

diff --git a/openssl_config/buildinf.x64.h b/openssl_config/buildinf.x64.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-x86_64"
-#define DATE "built on: Sat Dec 19 03:04:29 2020 +0100"
+#define DATE "built on: Mon Dec 21 15:27:53 2020 +0100"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a

diff --git a/openssl_config/buildinf.x86.h b/openssl_config/buildinf.x86.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-x86"
-#define DATE "built on: Sat Dec 19 03:04:29 2020 +0100"
+#define DATE "built on: Mon Dec 21 15:27:53 2020 +0100"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a