Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Oct 2018 21:18:08 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r482303 - branches/2018Q4/audio/xmms2/files
Message-ID:  <201810172118.w9HLI8W3084257@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Wed Oct 17 21:18:08 2018
New Revision: 482303
URL: https://svnweb.freebsd.org/changeset/ports/482303

Log:
  MFH: r482109
  
  Fix build with OpenSSL 1.1.x
  
  PR:		232154
  Submitted by:	me
  
  Approved by:	ports-secteam (miwi)

Added:
  branches/2018Q4/audio/xmms2/files/patch-src_plugins_airplay_raop__client.c
     - copied unchanged from r482109, head/audio/xmms2/files/patch-src_plugins_airplay_raop__client.c
Modified:
Directory Properties:
  branches/2018Q4/   (props changed)

Copied: branches/2018Q4/audio/xmms2/files/patch-src_plugins_airplay_raop__client.c (from r482109, head/audio/xmms2/files/patch-src_plugins_airplay_raop__client.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q4/audio/xmms2/files/patch-src_plugins_airplay_raop__client.c	Wed Oct 17 21:18:08 2018	(r482303, copy of r482109, head/audio/xmms2/files/patch-src_plugins_airplay_raop__client.c)
@@ -0,0 +1,25 @@
+--- src/plugins/airplay/raop_client.c.orig	2011-10-20 19:26:08 UTC
++++ src/plugins/airplay/raop_client.c
+@@ -1,6 +1,8 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
++#include <openssl/opensslv.h>
++#include <openssl/ossl_typ.h>
+ #include <openssl/rand.h>
+ #include <openssl/rsa.h>
+ #include <openssl/bio.h>
+@@ -137,8 +139,13 @@ raop_rsa_encrypt (guchar *text, gint len, guchar *res)
+ 	static const guchar exp[] = {0x01, 0x00, 0x01};
+ 
+ 	rsa = RSA_new ();
++
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rsa->n = BN_bin2bn (mod, 256, NULL);
+ 	rsa->e = BN_bin2bn (exp, 3, NULL);
++#else
++	RSA_set0_key(rsa, BN_bin2bn (mod, 256, NULL), BN_bin2bn (exp, 3, NULL), NULL);
++#endif
+ 
+ 	size = RSA_public_encrypt (len, text, res, rsa, RSA_PKCS1_OAEP_PADDING);
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810172118.w9HLI8W3084257>