File libmesode-0.9.1-openssl-1.1.patch of Package libmesode

Overview Repositories Revisions Requests Users Attributes Meta

File libmesode-0.9.1-openssl-1.1.patch of Package libmesode

From 5ab52edb943985fc3943b33d9a6be1b23045a052 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@vdwaa.nl>
Date: Wed, 15 Mar 2017 20:25:53 +0100
Subject: [PATCH] Fix build with OpenSSL 1.1.x

OpenSSL 1.1.x made many structs opaque and helpers are required to access
members of struct. TX509_PUBKEY_get0_param returns 1 for succes and 0 on
failure, this has not been handled yet by this patch.
---
 src/tls_openssl.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/tls_openssl.c b/src/tls_openssl.c
index 3118adc..89e2643 100644
--- a/src/tls_openssl.c
+++ b/src/tls_openssl.c
@@ -168,7 +168,15 @@ static struct _tlscert_t *_x509_to_tlscert(xmpp_ctx_t *ctx, X509 *cert)
 	}
 
     tlscert->keyalg = NULL;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 	int alg_nid = OBJ_obj2nid(cert->cert_info->key->algor->algorithm);
+#else
+	X509_PUBKEY *pubkey = X509_get_X509_PUBKEY(cert);
+	ASN1_OBJECT *ppkalg;
+	// FIXME: handle 0 on error.
+	X509_PUBKEY_get0_param(&ppkalg, NULL, NULL, NULL, NULL);
+	int alg_nid = OBJ_obj2nid(ppkalg);
+#endif
 	if (alg_nid != NID_undef) {
         const char* keyalg = OBJ_nid2ln(alg_nid);
         if (keyalg) {
@@ -177,7 +185,13 @@ static struct _tlscert_t *_x509_to_tlscert(xmpp_ctx_t *ctx, X509 *cert)
     }
 
     tlscert->sigalg = NULL;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 	alg_nid = OBJ_obj2nid(cert->sig_alg->algorithm);
+#else
+	const X509_ALGOR *palg;
+	X509_get0_signature(NULL, &palg, cert);
+	alg_nid = OBJ_obj2nid(palg->algorithm);
+#endif
 	if (alg_nid != NID_undef) {
         const char* sigalg = OBJ_nid2ln(alg_nid);
         if (sigalg) {

From b91872cf7e7ed4d2443ab5c622f4cdb395d64dbe Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Fri, 24 Mar 2017 00:21:21 +0000
Subject: [PATCH] Fix getting SSL public key algorithm

---
 src/tls_openssl.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/tls_openssl.c b/src/tls_openssl.c
index 6c93a4f..94e4c2b 100644
--- a/src/tls_openssl.c
+++ b/src/tls_openssl.c
@@ -169,15 +169,17 @@ static struct _tlscert_t *_x509_to_tlscert(xmpp_ctx_t *ctx, X509 *cert)
 
     tlscert->keyalg = NULL;
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
-	int alg_nid = OBJ_obj2nid(cert->cert_info->key->algor->algorithm);
+    int alg_nid = OBJ_obj2nid(cert->cert_info->key->algor->algorithm);
 #else
-	X509_PUBKEY *pubkey = X509_get_X509_PUBKEY(cert);
-	ASN1_OBJECT *ppkalg;
-	// FIXME: handle 0 on error.
-	X509_PUBKEY_get0_param(&ppkalg, NULL, NULL, NULL, NULL);
-	int alg_nid = OBJ_obj2nid(ppkalg);
+    X509_PUBKEY *pubkey = X509_get_X509_PUBKEY(cert);
+    ASN1_OBJECT *ppkalg = NULL;
+    int alg_nid = NID_undef;
+    res = X509_PUBKEY_get0_param(&ppkalg, NULL, NULL, NULL, pubkey);
+    if (res) {
+        alg_nid = OBJ_obj2nid(ppkalg);
+    }
 #endif
-	if (alg_nid != NID_undef) {
+    if (alg_nid != NID_undef) {
         const char* keyalg = OBJ_nid2ln(alg_nid);
         if (keyalg) {
             tlscert->keyalg = xmpp_strdup(ctx, keyalg);
@@ -186,13 +188,13 @@ static struct _tlscert_t *_x509_to_tlscert(xmpp_ctx_t *ctx, X509 *cert)
 
     tlscert->sigalg = NULL;
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
-	alg_nid = OBJ_obj2nid(cert->sig_alg->algorithm);
+    alg_nid = OBJ_obj2nid(cert->sig_alg->algorithm);
 #else
-	const X509_ALGOR *palg;
-	X509_get0_signature(NULL, &palg, cert);
-	alg_nid = OBJ_obj2nid(palg->algorithm);
+    const X509_ALGOR *palg;
+    X509_get0_signature(NULL, &palg, cert);
+    alg_nid = OBJ_obj2nid(palg->algorithm);
 #endif
-	if (alg_nid != NID_undef) {
+    if (alg_nid != NID_undef) {
         const char* sigalg = OBJ_nid2ln(alg_nid);
         if (sigalg) {
             tlscert->sigalg = xmpp_strdup(ctx, sigalg);

Places

File libmesode-0.9.1-openssl-1.1.patch of Package libmesode

Places