Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Jun 2015 12:18:27 +0000 (UTC)
From:      Jimmy Olgeni <olgeni@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r388915 - in head/lang/erlang-runtime17: . files
Message-ID:  <201506091218.t59CIR7x049421@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: olgeni
Date: Tue Jun  9 12:18:26 2015
New Revision: 388915
URL: https://svnweb.freebsd.org/changeset/ports/388915

Log:
  Add hotfix for unhandled cipher algorithms.
  
  Obtained from:	Ingela Andin (ingela.andin@gmail.com) on erlang-questions

Added:
  head/lang/erlang-runtime17/files/patch-lib_ssl_src_ssl__cipher.erl   (contents, props changed)
Modified:
  head/lang/erlang-runtime17/Makefile

Modified: head/lang/erlang-runtime17/Makefile
==============================================================================
--- head/lang/erlang-runtime17/Makefile	Tue Jun  9 12:17:59 2015	(r388914)
+++ head/lang/erlang-runtime17/Makefile	Tue Jun  9 12:18:26 2015	(r388915)
@@ -3,6 +3,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	17.5.6
+PORTREVISION=	1
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\

Added: head/lang/erlang-runtime17/files/patch-lib_ssl_src_ssl__cipher.erl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/erlang-runtime17/files/patch-lib_ssl_src_ssl__cipher.erl	Tue Jun  9 12:18:26 2015	(r388915)
@@ -0,0 +1,22 @@
+--- lib/ssl/src/ssl_cipher.erl.orig	2015-03-31 12:32:52 UTC
++++ lib/ssl/src/ssl_cipher.erl
+@@ -1209,7 +1209,8 @@ hash_algorithm(?SHA) -> sha;
+ hash_algorithm(?SHA224) -> sha224;
+ hash_algorithm(?SHA256) -> sha256;
+ hash_algorithm(?SHA384) -> sha384;
+-hash_algorithm(?SHA512) -> sha512.
++hash_algorithm(?SHA512) -> sha512;
++hash_algorithm(Other) when is_integer(Other) andalso ((Other >= 224) and (Other =< 255)) -> Other.
+ 
+ sign_algorithm(anon)  -> ?ANON;
+ sign_algorithm(rsa)   -> ?RSA;
+@@ -1218,7 +1219,8 @@ sign_algorithm(ecdsa) -> ?ECDSA;
+ sign_algorithm(?ANON) -> anon;
+ sign_algorithm(?RSA) -> rsa;
+ sign_algorithm(?DSA) -> dsa;
+-sign_algorithm(?ECDSA) -> ecdsa.
++sign_algorithm(?ECDSA) -> ecdsa;
++sign_algorithm(Other) when is_integer(Other) andalso ((Other >= 224) and (Other =< 255)) -> Other.
+ 
+ hash_size(null) ->
+     0;



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