cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cherrypick patch from OpenSSL_1_0_2-stable upstream:

Browse Source 
Correct number of arguments in BIO_get_conn_int_port macro.
This commit is contained in:
sthen 2016-01-28 22:50:59 +00:00
parent b2c1764b0d
commit 0da19f8387
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
security/openssl/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.14 2016/01/28 15:51:38 sthen Exp $
# $OpenBSD: Makefile,v 1.15 2016/01/28 22:50:59 sthen Exp $
COMMENT= TLS/SSL library and tools
V= 1.0.2f
REVISION= 0
DISTNAME= openssl-$V
PKGNAME= openssl-$V

21
security/openssl/patches/patch-crypto_bio_bio_h Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-crypto_bio_bio_h,v 1.1 2016/01/28 22:50:59 sthen Exp $
From da7947e8c6915d86616425ecbc4906f079ef122f Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Thu, 28 Jan 2016 17:55:11 +0100
Subject: [PATCH] Correct number of arguments in BIO_get_conn_int_port macro
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 41a28cb2944a4e1c9d13889757a3bd9f72abeca1)
--- crypto/bio/bio.h.orig Thu Jan 28 22:47:31 2016
+++ crypto/bio/bio.h Thu Jan 28 22:47:39 2016
@@ -479,7 +479,7 @@ struct bio_dgram_sctp_prinfo {
# define BIO_get_conn_hostname(b) BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0)
# define BIO_get_conn_port(b) BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1)
# define BIO_get_conn_ip(b) BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2)
-# define BIO_get_conn_int_port(b) BIO_ctrl(b,BIO_C_GET_CONNECT,3,0,NULL)
+# define BIO_get_conn_int_port(b) BIO_ctrl(b,BIO_C_GET_CONNECT,3,NULL)
# define BIO_set_nbio(b,n) BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL)