Attachment 155420 Details for Bug 198527 – patch for security/heimdal

patch for security/heimdal

fbsd-heimdal.txt (text/plain), 4.39 KB, created by Sevan Janiyan on 2015-04-10 12:26:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sevan Janiyan

Created: 2015-04-10 12:26:13 UTC

Size: 4.39 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 383556)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	heimdal
> PORTVERSION=	1.5.3
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	security ipv6
> MASTER_SITES=	http://www.h5l.org/dist/src/ \
> 		http://ftp.pdc.kth.se/pub/heimdal/src/ \
>@@ -23,6 +23,7 @@
> 		readline makeinfo
> USE_LDCONFIG=	${GSSAPILIBDIR}
> USE_OPENSSL=	yes
>+USE_AUTOTOOLS=	autoconf
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
> CONFIGURE_ENV=	ac_cv_header_fnmatch_h=yes \
>Index: files/patch-cf_crypto.m4
>===================================================================
>--- files/patch-cf_crypto.m4	(revision 0)
>+++ files/patch-cf_crypto.m4	(working copy)
>@@ -0,0 +1,10 @@
>+--- cf/crypto.m4.orig	2015-04-10 11:59:52.241396463 +0100
>++++ cf/crypto.m4	2015-04-10 12:00:07.450415022 +0100
>+@@ -143,6 +143,7 @@
>+ 			break;
>+ 		fi
>+ 	done
>++	AC_CHECK_LIB(crypto, RAND_egd, AC_DEFINE(HAVE_RAND_EGD, 1, [Define if the libcrypto has RAND_egd]))
>+ 	CFLAGS="$save_CFLAGS"
>+ 	LIBS="$save_LIBS"
>+ fi
>
>Property changes on: files/patch-cf_crypto.m4
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>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
>Index: files/patch-include_crypto-headers.h
>===================================================================
>--- files/patch-include_crypto-headers.h	(revision 0)
>+++ files/patch-include_crypto-headers.h	(working copy)
>@@ -0,0 +1,14 @@
>+--- include/crypto-headers.h.orig	2012-12-09 22:06:44.000000000 +0000
>++++ include/crypto-headers.h	2015-04-10 11:58:58.237397085 +0100
>+@@ -28,6 +28,11 @@
>+ #ifndef BN_is_negative
>+ #define BN_set_negative(bn, flag) ((bn)->neg=(flag)?1:0)
>+ #define BN_is_negative(bn) ((bn)->neg != 0)
>++
>++#ifndef LIBRESSL_VERSION_NUMBER
>++#define HAVE_RAND_EGD
>++#endif
>++
>+ #endif
>+ 
>+ #else /* !HAVE_OPENSSL */
>
>Property changes on: files/patch-include_crypto-headers.h
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>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
>Index: files/patch-lib_hcrypot_rand-egd.c
>===================================================================
>--- files/patch-lib_hcrypot_rand-egd.c	(revision 0)
>+++ files/patch-lib_hcrypot_rand-egd.c	(working copy)
>@@ -0,0 +1,16 @@
>+--- lib/hcrypto/rand-egd.c.orig	2012-12-09 22:06:44.000000000 +0000
>++++ lib/hcrypto/rand-egd.c	2015-04-10 11:58:58.243409314 +0100
>+@@ -33,6 +33,8 @@
>+ 
>+ #include <config.h>
>+ 
>++#ifdef HAVE_RAND_EGD
>++
>+ #include <sys/types.h>
>+ #ifdef HAVE_SYS_UN_H
>+ #include <sys/un.h>
>+@@ -258,3 +260,4 @@
>+ 
>+     return 1;
>+ }
>++#endif
>
>Property changes on: files/patch-lib_hcrypot_rand-egd.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: files/patch-lib_krb5_crypto-rand.c
>===================================================================
>--- files/patch-lib_krb5_crypto-rand.c	(revision 0)
>+++ files/patch-lib_krb5_crypto-rand.c	(working copy)
>@@ -0,0 +1,18 @@
>+--- lib/krb5/crypto-rand.c.orig	2012-12-09 22:06:44.000000000 +0000
>++++ lib/krb5/crypto-rand.c	2015-04-10 11:58:58.249427321 +0100
>+@@ -66,6 +66,7 @@
>+ 	krb5_context context;
>+ 	const char *p;
>+ 
>++#ifdef HAVE_RAND_EGD
>+ 	/* Try using egd */
>+ 	if (!krb5_init_context(&context)) {
>+ 	    p = krb5_config_get_string(context, NULL, "libdefaults",
>+@@ -74,6 +75,7 @@
>+ 		RAND_egd_bytes(p, ENTROPY_NEEDED);
>+ 	    krb5_free_context(context);
>+ 	}
>++#endif
>+ #else
>+ 	/* TODO: Once a Windows CryptoAPI RAND method is defined, we
>+ 	   can use that and failover to another method. */
>
>Property changes on: files/patch-lib_krb5_crypto-rand.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>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

Actions: View

Attachments on bug 198527: 154222 | 155420 | 155435 | 159861 | 167022