From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Sep 6 09:50:01 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 610AC1065672 for ; Tue, 6 Sep 2011 09:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 369F88FC0A for ; Tue, 6 Sep 2011 09:50:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p869o1BJ059615 for ; Tue, 6 Sep 2011 09:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p869o196059614; Tue, 6 Sep 2011 09:50:01 GMT (envelope-from gnats) Resent-Date: Tue, 6 Sep 2011 09:50:01 GMT Resent-Message-Id: <201109060950.p869o196059614@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, h h Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 40F13106564A for ; Tue, 6 Sep 2011 09:43:37 +0000 (UTC) (envelope-from aakuusta@gmail.com) Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.161.182]) by mx1.freebsd.org (Postfix) with ESMTP id 018598FC14 for ; Tue, 6 Sep 2011 09:43:36 +0000 (UTC) Received: by gxk28 with SMTP id 28so4509880gxk.13 for ; Tue, 06 Sep 2011 02:43:36 -0700 (PDT) Received: by 10.42.18.138 with SMTP id x10mr4302075ica.68.1315302216119; Tue, 06 Sep 2011 02:43:36 -0700 (PDT) Received: from nil (tor-exit-router45-readme.formlessnetworking.net [199.48.147.45]) by mx.google.com with ESMTPS id z11sm18268592iba.6.2011.09.06.02.43.32 (version=SSLv3 cipher=OTHER); Tue, 06 Sep 2011 02:43:35 -0700 (PDT) Message-Id: <86zkii3t1d.fsf@gmail.com> Date: Tue, 06 Sep 2011 13:43:26 +0400 From: h h To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/160509: [patch] security/cryptopp: clang build fails (foo vs. this->foo) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Sep 2011 09:50:01 -0000 >Number: 160509 >Category: ports >Synopsis: [patch] security/cryptopp: clang build fails (foo vs. this->foo) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Sep 06 09:50:00 UTC 2011 >Closed-Date: >Last-Modified: >Originator: h h >Release: FreeBSD 9.0-BETA2 r225402M amd64 >Organization: >Environment: >Description: >How-To-Repeat: http://pointyhat.freebsd.org/errorlogs/amd64-errorlogs/e.9-exp.20110723205754/cryptopp-5.6.1.log >Fix: --- a.diff begins here --- Index: security/cryptopp/files/patch-clang =================================================================== RCS file: security/cryptopp/files/patch-clang diff -N security/cryptopp/files/patch-clang --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ security/cryptopp/files/patch-clang 6 Sep 2011 09:33:56 -0000 @@ -0,0 +1,97 @@ +--- algebra.cpp~ ++++ algebra.cpp +@@ -58,7 +58,7 @@ template const T& AbstractEuclideanDomain::Gcd(const Element &a, co + Element g[3]={b, a}; + unsigned int i0=0, i1=1, i2=2; + +- while (!Equal(g[i1], this->Identity())) ++ while (!this->Equal(g[i1], this->Identity())) + { + g[i2] = Mod(g[i0], g[i1]); + unsigned int t = i0; i0 = i1; i1 = i2; i2 = t; +--- eccrypto.cpp~ ++++ eccrypto.cpp +@@ -435,7 +435,7 @@ template void DL_GroupParameters_EC::Initialize(const OID &oid) + StringSource ssG(param.g, true, new HexDecoder); + Element G; + bool result = GetCurve().DecodePoint(G, ssG, (size_t)ssG.MaxRetrievable()); +- SetSubgroupGenerator(G); ++ this->SetSubgroupGenerator(G); + assert(result); + + StringSource ssN(param.n, true, new HexDecoder); +@@ -591,7 +591,7 @@ bool DL_GroupParameters_EC::ValidateElement(unsigned int level, const Elemen + if (level >= 2 && pass) + { + const Integer &q = GetSubgroupOrder(); +- Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : ExponentiateElement(g, q); ++ Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : this->ExponentiateElement(g, q); + pass = pass && IsIdentity(gq); + } + return pass; +@@ -629,7 +629,7 @@ void DL_PublicKey_EC::BERDecodePublicKey(BufferedTransformation &bt, bool pa + typename EC::Point P; + if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size)) + BERDecodeError(); +- SetPublicElement(P); ++ this->SetPublicElement(P); + } + + template +--- eccrypto.h~ ++++ eccrypto.h +@@ -43,7 +43,7 @@ public: + void Initialize(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero()) + { + this->m_groupPrecomputation.SetCurve(ec); +- SetSubgroupGenerator(G); ++ this->SetSubgroupGenerator(G); + m_n = n; + m_k = k; + } +@@ -145,9 +145,9 @@ public: + typedef typename EC::Point Element; + + void Initialize(const DL_GroupParameters_EC ¶ms, const Element &Q) +- {this->AccessGroupParameters() = params; SetPublicElement(Q);} ++ {this->AccessGroupParameters() = params; this->SetPublicElement(Q);} + void Initialize(const EC &ec, const Element &G, const Integer &n, const Element &Q) +- {this->AccessGroupParameters().Initialize(ec, G, n); SetPublicElement(Q);} ++ {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPublicElement(Q);} + + // X509PublicKey + void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size); +@@ -166,9 +166,9 @@ public: + void Initialize(const EC &ec, const Element &G, const Integer &n, const Integer &x) + {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPrivateExponent(x);} + void Initialize(RandomNumberGenerator &rng, const DL_GroupParameters_EC ¶ms) +- {GenerateRandom(rng, params);} ++ {this->GenerateRandom(rng, params);} + void Initialize(RandomNumberGenerator &rng, const EC &ec, const Element &G, const Integer &n) +- {GenerateRandom(rng, DL_GroupParameters_EC(ec, G, n));} ++ {this->GenerateRandom(rng, DL_GroupParameters_EC(ec, G, n));} + + // PKCS8PrivateKey + void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size); +--- panama.cpp~ ++++ panama.cpp +@@ -422,7 +422,7 @@ void PanamaHash::TruncatedFinal(byte + { + this->ThrowIfInvalidTruncatedSize(size); + +- PadLastBlock(this->BLOCKSIZE, 0x01); ++ this->PadLastBlock(this->BLOCKSIZE, 0x01); + + HashEndianCorrectedBlock(this->m_data); + +--- secblock.h~ ++++ secblock.h +@@ -88,7 +88,7 @@ public: + + pointer allocate(size_type n, const void * = NULL) + { +- CheckSize(n); ++ this->CheckSize(n); + if (n == 0) + return NULL; + --- a.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: