From owner-svn-ports-all@FreeBSD.ORG Fri Apr 11 03:57:14 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3A78FB1E; Fri, 11 Apr 2014 03:57:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 26D061BEF; Fri, 11 Apr 2014 03:57:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3B3vENO010945; Fri, 11 Apr 2014 03:57:14 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3B3vDHi010943; Fri, 11 Apr 2014 03:57:13 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201404110357.s3B3vDHi010943@svn.freebsd.org> From: Bryan Drewery Date: Fri, 11 Apr 2014 03:57:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350882 - head/math/miracl/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2014 03:57:14 -0000 Author: bdrewery Date: Fri Apr 11 03:57:13 2014 New Revision: 350882 URL: http://svnweb.freebsd.org/changeset/ports/350882 QAT: https://qat.redports.org/buildarchive/r350882/ Log: Fix build with clang34 Added: head/math/miracl/files/patch-big.h (contents, props changed) head/math/miracl/files/patch-zzn.h (contents, props changed) Added: head/math/miracl/files/patch-big.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/miracl/files/patch-big.h Fri Apr 11 03:57:13 2014 (r350882) @@ -0,0 +1,43 @@ +--- ./big.h.orig 2012-03-07 16:18:08.000000000 -0600 ++++ ./big.h 2014-04-10 22:50:46.942771472 -0500 +@@ -299,7 +299,7 @@ + {if (mr_compare(b1.fn,b2.fn)>0) return TRUE; else return FALSE;} + + friend Big from_binary(int,char *); +- friend int to_binary(const Big&,int,char *,BOOL justify=FALSE); ++ friend int to_binary(const Big&,int,char *,BOOL justify); + friend Big modmult(const Big&,const Big&,const Big&); + friend Big mad(const Big&,const Big&,const Big&,const Big&,Big&); + friend Big norm(const Big&); +@@ -321,7 +321,7 @@ + // x^m.y^k mod n + friend Big pow(int,Big *,Big *,Big); // x[0]^m[0].x[1].m[1]... mod n + +- friend Big luc(const Big& ,const Big&, const Big&, Big *b4=NULL); ++ friend Big luc(const Big& ,const Big&, const Big&, Big *b4); + friend Big moddiv(const Big&,const Big&,const Big&); + friend Big inverse(const Big&, const Big&); + friend void multi_inverse(int,Big*,const Big&,Big *); +@@ -353,8 +353,8 @@ + friend void modulo(const Big&); + friend BOOL modulo(int,int,int,int,BOOL); + friend Big get_modulus(void); +- friend int window(const Big&,int,int*,int*,int window_size=5); +- friend int naf_window(const Big&,const Big&,int,int*,int*,int store=11); ++ friend int window(const Big&,int,int*,int*,int window_size); ++ friend int naf_window(const Big&,const Big&,int,int*,int*,int store); + friend void jsf(const Big&,const Big&,Big&,Big&,Big&,Big&); + + /* Montgomery stuff */ +@@ -420,7 +420,10 @@ + extern Big rand(int,int); + extern Big strong_rand(csprng *,int,int); + extern Big from_binary(int,char *); +-extern int to_binary(const Big&,int,char *,BOOL); ++extern int to_binary(const Big&,int,char *,BOOL=false); ++extern Big luc(const Big& ,const Big&, const Big&, Big *b4=NULL); ++extern int window(const Big&,int,int*,int*,int window_size=5); ++extern int naf_window(const Big&,const Big&,int,int*,int*,int store=11); + + using namespace std; + Added: head/math/miracl/files/patch-zzn.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/miracl/files/patch-zzn.h Fri Apr 11 03:57:13 2014 (r350882) @@ -0,0 +1,19 @@ +--- ./zzn.h.orig 2014-04-10 22:52:14.562766913 -0500 ++++ ./zzn.h 2014-04-10 22:52:17.524768077 -0500 +@@ -183,7 +183,7 @@ + friend ZZn getB(void); // get B parameter of elliptic curve + + friend ZZn sqrt(const ZZn&); // only works if modulus is prime +- friend ZZn luc( const ZZn&, const Big&, ZZn* b3=NULL); ++ friend ZZn luc( const ZZn&, const Big&, ZZn* b3); + + big getzzn(void) const; + +@@ -206,6 +206,7 @@ + extern ZZn getA(void); + extern ZZn getB(void); + extern ZZn one(void); ++extern ZZn luc( const ZZn&, const Big&, ZZn* b3=NULL); + + #endif +