From nobody Thu Mar 7 09:48:25 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tr4HY4NNYz5D8Lw; Thu, 7 Mar 2024 09:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tr4HY27pKz4WBx; Thu, 7 Mar 2024 09:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709804905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gLN2nrmW1NXS6kYIDdyjJ3JodhkgR2YWLxaZI8KvjlE=; b=Nue3a/+J7QG1MajV4b7fgYMs/CKHNmSupHCRdVP/DoWGXbUmhsW8ZhqZcm3uu3y0fGoZbQ rZDsZegF4rVwlRFpYolmMa6bwy/79umFMQzR7mwxGkrmw20d5/sL1Ov7qKVVf5UyJxY9uL s+jIUqk3P8drnHtup8POxCmNFC2kMeibvFS8K24YXT6YPvvk8fwDv4nZUwVVtsUmSi6o0+ 1Bu/VQzC64ePmTPCmVktNrw7DbYrPsq/BIIhu3lxrMXcOgp55uV6bdBS060ODZaNhZFlZU kqL1yTRiIsjyXKFBx7cUBVmPYVeIR14LlXAGfGnp6Q7NtwqapTmgxrCALnB75A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709804905; a=rsa-sha256; cv=none; b=iorBaLZF3ad+zdDY9fganLcnYot7+XsRbFxXMBQOWb+D0tVTwltzZj47X+1DXE0kT0CXko CuKs2XY3h36F7XkVxNGCTU4F8aoL4BTPsSylsD8euhWh9J/LeyDNKCo9+7qf1VoJMOjIxY rzWKmlmosJVq1Bqay2/K5/5J1mHCQCYXFrqMJILPbbuDjaMwwoJqAWBNBuRDlIC/Vn4Ocj BI0Iv6468DRkK3mgJfQQS/HKFCjYvPMF33pdyBvmjG1pZuCBjCh5nIrLYI/Wvuaqk9GIur 7fiGy0g3WTib4H2p9+PnSC1gm7d9jTj9ElqV4KNEUFeFUv0/XoPWIaF6T1aEXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709804905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gLN2nrmW1NXS6kYIDdyjJ3JodhkgR2YWLxaZI8KvjlE=; b=f4snn3SZV1gzmxImOPcuFzkMMNiGYEWegi1y4ZhI2MnhB2g7QCpo0YcFB9jlTdRD7YvLyF fmglJlzxpoo2NSqfSgl9eTiyoxpv0fSX/3Xsk5kK00lTNzGjtAPILUdJuFY6BY7ux4t7Uc HArCFF2ZM2ujgY6UXs1s7o7KX2B3fLUZDfFkYTzfnzcBprH36iHUX7P1yL6+nJPus92HPy UAVAh9Lywesk2h+VdNloUhJPfpk/Cs24ZaGjdb35uO2Il/gRQdP8Z9EUjc5Shc5L+Ne2kx xuTL3wH43Fpe3FVeOe38Vs1A4Pl18WQanQnTsaOYTETxuU9pGxsGvNGhY36h6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tr4HY1m2jzTGM; Thu, 7 Mar 2024 09:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4279mPKt085655; Thu, 7 Mar 2024 09:48:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4279mPMs085652; Thu, 7 Mar 2024 09:48:25 GMT (envelope-from git) Date: Thu, 7 Mar 2024 09:48:25 GMT Message-Id: <202403070948.4279mPMs085652@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 76c97e7c968a - main - security/openfhe: update 1.1.2 =?utf-8?Q?=E2=86=92?= 1.1.3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76c97e7c968a50308665ddbcae3862c3b3d7eea5 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=76c97e7c968a50308665ddbcae3862c3b3d7eea5 commit 76c97e7c968a50308665ddbcae3862c3b3d7eea5 Author: Yuri Victorovich AuthorDate: 2024-03-07 08:03:29 +0000 Commit: Yuri Victorovich CommitDate: 2024-03-07 09:48:09 +0000 security/openfhe: update 1.1.2 → 1.1.3 Reported by: portscout --- security/openfhe/Makefile | 2 +- security/openfhe/distinfo | 6 +-- ...tch-src_core_include_math_hal_intnat_ubintnat.h | 47 +++++++++++----------- security/openfhe/pkg-plist | 8 ++-- 4 files changed, 33 insertions(+), 30 deletions(-) diff --git a/security/openfhe/Makefile b/security/openfhe/Makefile index 4182b169afca..def969ab69a5 100644 --- a/security/openfhe/Makefile +++ b/security/openfhe/Makefile @@ -1,6 +1,6 @@ PORTNAME= openfhe DISTVERSIONPREFIX= v -DISTVERSION= 1.1.2 +DISTVERSION= 1.1.3 CATEGORIES= security math MAINTAINER= yuri@FreeBSD.org diff --git a/security/openfhe/distinfo b/security/openfhe/distinfo index 54f74b804da4..efff6613e500 100644 --- a/security/openfhe/distinfo +++ b/security/openfhe/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1702792636 -SHA256 (openfheorg-openfhe-development-v1.1.2_GH0.tar.gz) = f728f040e33a3a4ecc8d08de66433882d157eb63870122e58240b825d57af707 -SIZE (openfheorg-openfhe-development-v1.1.2_GH0.tar.gz) = 1987229 +TIMESTAMP = 1709795933 +SHA256 (openfheorg-openfhe-development-v1.1.3_GH0.tar.gz) = 33fd5cd5936c0f967187969572614af186b99a41db1a0474dbbedd9d1234a2d2 +SIZE (openfheorg-openfhe-development-v1.1.3_GH0.tar.gz) = 1994424 SHA256 (openfheorg-cereal-984e3f1_GH0.tar.gz) = d79d6b97a53c1adb67a001d3b85a3f7396131bfefb09a64b6ea78fa5a17c5fc5 SIZE (openfheorg-cereal-984e3f1_GH0.tar.gz) = 386502 SHA256 (google-googletest-8b4817e_GH0.tar.gz) = 2707e4eecfb7ab19678c435e469c500e253c85236fc6a78e9fb5cb166f4d88d2 diff --git a/security/openfhe/files/patch-src_core_include_math_hal_intnat_ubintnat.h b/security/openfhe/files/patch-src_core_include_math_hal_intnat_ubintnat.h index cd99c0741a09..a07d0d338da7 100644 --- a/security/openfhe/files/patch-src_core_include_math_hal_intnat_ubintnat.h +++ b/security/openfhe/files/patch-src_core_include_math_hal_intnat_ubintnat.h @@ -1,25 +1,26 @@ ---- src/core/include/math/hal/intnat/ubintnat.h.orig 2023-12-16 19:03:47 UTC +--- src/core/include/math/hal/intnat/ubintnat.h.orig 2024-03-05 00:18:51 UTC +++ src/core/include/math/hal/intnat/ubintnat.h -@@ -1935,16 +1935,16 @@ class NativeIntegerT final : public lbcrypto::BigInteg - res.lo = x.lo * y; - asm("umulh %0, %1, %2\n\t" : "=r"(res.hi) : "r"(x.lo), "r"(y)); - res.hi += x.hi * y; --#elif defined(__arm__) // 32 bit processor -+#elif defined(__powerpc64__) || defined(__riscv) -+ U128BITS wres(0), wa(a), wb(b); -+ wres = wa * wb; // should give us 128 bits of 64 * 64 -+ res.hi = (uint64_t)(wres >> 64); -+ res.lo = (uint64_t)wres; -+#elif defined(__arm__) || defined(__powerpc__) // 32 bit processor - uint64_t wres(0), wa(a), wb(b); - wres = wa * wb; - res.hi = wres >> 32; - res.lo = (uint32_t)wres & 0xFFFFFFFF; --#elif __riscv -- U128BITS wres(0), wa(a), wb(b); -- wres = wa * wb; -- res.hi = (uint64_t)(wres >> 64); -- res.lo = (uint64_t)wres; +@@ -1919,6 +1919,11 @@ class NativeIntegerT final : public lbcrypto::BigInteg + uint128_t c{static_cast(a) * b}; + res.hi = static_cast(c >> 64); + res.lo = static_cast(c); ++#elif __riscv ++ U128BITS wres(0), wa(a), wb(b); ++ wres = wa * wb; ++ res.hi = (uint64_t)(wres >> 64); ++ res.lo = (uint64_t)wres; #elif defined(__EMSCRIPTEN__) // web assembly - U64BITS a1 = a >> 32; - U64BITS a2 = (uint32_t)a; + uint64_t a1 = a >> 32; + uint64_t a2 = (uint32_t)a; +@@ -1957,6 +1962,11 @@ class NativeIntegerT final : public lbcrypto::BigInteg + res.lo = x.lo * y; + asm("umulh %0, %1, %2\n\t" : "=r"(res.hi) : "r"(x.lo), "r"(y)); + res.hi += x.hi * y; ++#elif defined(__powerpc64__) || defined(__riscv) ++ U128BITS wres(0), wa(a), wb(b); ++ wres = wa * wb; // should give us 128 bits of 64 * 64 ++ res.hi = (uint64_t)(wres >> 64); ++ res.lo = (uint64_t)wres; + #elif defined(__arm__) || defined(__powerpc__) // 32 bit processor + uint64_t wres(0), wa(a), wb(b); + wres = wa * wb; diff --git a/security/openfhe/pkg-plist b/security/openfhe/pkg-plist index 05b65ed440bd..49e38d2e326e 100644 --- a/security/openfhe/pkg-plist +++ b/security/openfhe/pkg-plist @@ -309,9 +309,11 @@ include/openfhe/pke/scheme/ckksrns/ckksrns-utils.h include/openfhe/pke/scheme/ckksrns/gen-cryptocontext-ckksrns-internal.h include/openfhe/pke/scheme/ckksrns/gen-cryptocontext-ckksrns-params.h include/openfhe/pke/scheme/ckksrns/gen-cryptocontext-ckksrns.h +include/openfhe/pke/scheme/ckksrns/schemeswitching-data-serializer.h include/openfhe/pke/scheme/gen-cryptocontext-params-defaults.h include/openfhe/pke/scheme/gen-cryptocontext-params.h include/openfhe/pke/scheme/scheme-id.h +include/openfhe/pke/scheme/scheme-swch-params.h include/openfhe/pke/scheme/scheme-utils.h include/openfhe/pke/schemebase/base-advancedshe.h include/openfhe/pke/schemebase/base-cryptoparameters.h @@ -349,10 +351,10 @@ lib/OpenFHE/OpenFHETargets-%%CMAKE_BUILD_TYPE%%.cmake lib/OpenFHE/OpenFHETargets.cmake lib/libOPENFHEbinfhe.so lib/libOPENFHEbinfhe.so.1 -lib/libOPENFHEbinfhe.so.1.1.2 +lib/libOPENFHEbinfhe.so.1.1.3 lib/libOPENFHEcore.so lib/libOPENFHEcore.so.1 -lib/libOPENFHEcore.so.1.1.2 +lib/libOPENFHEcore.so.1.1.3 lib/libOPENFHEpke.so lib/libOPENFHEpke.so.1 -lib/libOPENFHEpke.so.1.1.2 +lib/libOPENFHEpke.so.1.1.3