Attachment 198023 Details for Bug 232168 – Fix OpenSSL 1.1.x build

[patch] Fix OpenSSL 1.1.x build

mosquitto (text/plain), 4.59 KB, created by Nathan on 2018-10-11 00:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan

Created: 2018-10-11 00:50:01 UTC

Size: 4.59 KB

patch

obsolete

>net/mosquitto: Fix OpenSSL build
>
>PR:		231931
>Submitted by:	Nathan <ndowens@yahoo.com>
>
>Index: net/mosquitto/files/patch-src_mosquitto__passwd.c
>===================================================================
>--- net/mosquitto/files/patch-src_mosquitto__passwd.c	(nonexistent)
>+++ net/mosquitto/files/patch-src_mosquitto__passwd.c	(working copy)
>@@ -0,0 +1,33 @@
>+ lib/mosquitto_internal.h | 3 +++
>+ src/mosquitto_passwd.c   | 4 ++--
>+ src/security_default.c   | 2 +-
>+ 3 files changed, 6 insertions(+), 3 deletions(-)
>+
>+--- src/mosquitto_passwd.c.orig	2018-10-11 00:27:05 UTC
>++++ src/mosquitto_passwd.c
>+@@ -17,6 +17,7 @@ Contributors:
>+ #include "config.h"
>+ 
>+ #include <errno.h>
>++#include <openssl/opensslv.h>
>+ #include <openssl/evp.h>
>+ #include <openssl/rand.h>
>+ #include <openssl/buffer.h>
>+@@ -99,7 +100,7 @@ int output_new_password(FILE *fptr, const char *userna
>+ 	unsigned char hash[EVP_MAX_MD_SIZE];
>+ 	unsigned int hash_len;
>+ 	const EVP_MD *digest;
>+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
>++#ifdef HAVE_OPENSSL_OPAQUE_STRUCTS 
>+ 	EVP_MD_CTX context;
>+ #else
>+ 	EVP_MD_CTX *context;
>+@@ -126,7 +127,7 @@ int output_new_password(FILE *fptr, const char *userna
>+ 		return 1;
>+ 	}
>+ 
>+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
>++#if OPENSSL_VERSION_NUMBER < 0x10100000L 
>+ 	EVP_MD_CTX_init(&context);
>+ 	EVP_DigestInit_ex(&context, digest, NULL);
>+ 	EVP_DigestUpdate(&context, password, strlen(password));
>
>Property changes on: net/mosquitto/files/patch-src_mosquitto__passwd.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/mosquitto/files/patch-src_security__default.c
>===================================================================
>--- net/mosquitto/files/patch-src_security__default.c	(nonexistent)
>+++ net/mosquitto/files/patch-src_security__default.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/security_default.c.orig	2018-10-11 00:28:56 UTC
>++++ src/security_default.c
>+@@ -18,7 +18,7 @@ Contributors:
>+ 
>+ #include <stdio.h>
>+ #include <string.h>
>+-
>++#include <openssl/opensslv.h>
>+ #include "mosquitto_broker_internal.h"
>+ #include "memory_mosq.h"
>+ #include "util_mosq.h"
>
>Property changes on: net/mosquitto/files/patch-src_security__default.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/mosquitto/files/patch-support-libressl
>===================================================================
>--- net/mosquitto/files/patch-support-libressl	(revision 481687)
>+++ net/mosquitto/files/patch-support-libressl	(nonexistent)
>@@ -1,36 +0,0 @@
>- lib/mosquitto_internal.h | 3 +++
>- src/mosquitto_passwd.c   | 4 ++--
>- src/security_default.c   | 2 +-
>- 3 files changed, 6 insertions(+), 3 deletions(-)
>-
>---- src/mosquitto_passwd.c.orig	2018-09-25 15:27:43 UTC
>-+++ src/mosquitto_passwd.c
>-@@ -99,7 +99,7 @@ int output_new_password(FILE *fptr, const char *userna
>- 	unsigned char hash[EVP_MAX_MD_SIZE];
>- 	unsigned int hash_len;
>- 	const EVP_MD *digest;
>--#if OPENSSL_VERSION_NUMBER < 0x10100000L
>-+#ifndef HAVE_OPENSSL_OPAQUE_STRUCTS
>- 	EVP_MD_CTX context;
>- #else
>- 	EVP_MD_CTX *context;
>-@@ -126,7 +126,7 @@ int output_new_password(FILE *fptr, const char *userna
>- 		return 1;
>- 	}
>- 
>--#if OPENSSL_VERSION_NUMBER < 0x10100000L
>-+#ifndef HAVE_OPENSSL_OPAQUE_STRUCTS
>- 	EVP_MD_CTX_init(&context);
>- 	EVP_DigestInit_ex(&context, digest, NULL);
>- 	EVP_DigestUpdate(&context, password, strlen(password));
>---- src/security_default.c.orig	2018-09-25 15:27:43 UTC
>-+++ src/security_default.c
>-@@ -958,7 +958,7 @@ int mosquitto_psk_key_get_default(struct mosquitto_db 
>- int pw__digest(const char *password, const unsigned char *salt, unsigned int salt_len, unsigned char *hash, unsigned int *hash_len)
>- {
>- 	const EVP_MD *digest;
>--#if OPENSSL_VERSION_NUMBER < 0x10100000L
>-+#ifndef HAVE_OPENSSL_OPAQUE_STRUCTS
>- 	EVP_MD_CTX context;
>- 
>- 	digest = EVP_get_digestbyname("sha512");
>
>Property changes on: net/mosquitto/files/patch-support-libressl
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 232168: 198023 | 198024