Update Go version and dependencies

.github/workflows/pull-request.yml

@@ -13,7 +13,7 @@ on:
 env:
   GOPATH: /opt/go
   PATH: /opt/go/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
-  GO_VER: 1.23.5
+  GO_VER: 1.25.3
 
 permissions:
   contents: read
@@ -28,7 +28,7 @@ jobs:
       - run: sudo apt update
         name: Run Apt Update
       - uses: actions/checkout@v4
-        name: Checkout Fabric CA Code        
+        name: Checkout Fabric CA Code
       - uses: actions/setup-go@v5
         name: Install Go
         with:
@@ -44,7 +44,7 @@ jobs:
       - run: sudo apt update
         name: Run Apt Update
       - uses: actions/checkout@v4
-        name: Checkout Fabric CA Code        
+        name: Checkout Fabric CA Code
       - uses: actions/setup-go@v5
         name: Install Go
         with:

.github/workflows/release.yml

@@ -6,10 +6,10 @@ name: Release
 
 on:
   push:
-    tags: [ v1.* ]
+    tags: [v1.*]
 
 env:
-  GO_VER: 1.23.5
+  GO_VER: 1.25.3
   UBUNTU_VER: 22.04
   IMAGE_NAME: ${{ github.repository }}
   FABRIC_CA_VER: ${{ github.ref_name }}
@@ -37,14 +37,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         name: Checkout Fabric CA Code
-      
+
       - uses: actions/setup-go@v5
         name: Install Go
         with:
           go-version: ${{ env.GO_VER }}
 
       - name: Install GCC cross-compilers
-        if:  ${{ contains(matrix.platform, 'linux') }}
+        if: ${{ contains(matrix.platform, 'linux') }}
         run: |
           sudo apt-get update
           sudo apt-get -y install gcc-aarch64-linux-gnu
@@ -63,7 +63,6 @@ jobs:
           # <path> of the artifact may include multiple files.
           path: release/${{ matrix.platform }}/*.tar.gz
 
-
   # build native image using a different runner for each architecture (faster and more reliable than using qemu to build multi-architecture images on ubuntu-22.04)
   build-and-push-native-docker-images:
     name: Build and Push native image
@@ -76,15 +75,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-
         runner:
-          - ubuntu-22.04      # creates linux-amd64 images
-          - ubuntu-22.04-arm  # creates linux-arm64 images 
-  
+          - ubuntu-22.04 # creates linux-amd64 images
+          - ubuntu-22.04-arm # creates linux-arm64 images
+
         # Dynamic matrix
         # If owner is 'hyperledger' run job for Docker Hub and ghcr, otherwise for personal forks just run job for ghcr
         registry: ${{ fromJSON(github.repository_owner == 'hyperledger' && '["docker.io", "ghcr.io"]' || '["ghcr.io"]') }}
-          
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -124,7 +122,7 @@ jobs:
           mkdir -p ${{ runner.temp }}/digests/${{ matrix.registry }}
           digest="${{ steps.build-and-push.outputs.digest }}"
           touch "${{ runner.temp }}/digests/${{ matrix.registry }}/${digest#sha256:}"
-  
+
       - name: Upload digest
         uses: actions/upload-artifact@v4
         with:
@@ -148,13 +146,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-
         # Dynamic matrix
         # If owner is 'hyperledger' run job for Docker Hub and ghcr, otherwise for personal forks just run job for ghcr
         registry: ${{ fromJSON(github.repository_owner == 'hyperledger' && '["docker.io", "ghcr.io"]' || '["ghcr.io"]') }}
-
-    steps:
 
+    steps:
       - name: Download digests
         uses: actions/download-artifact@v4
         with:
@@ -181,13 +177,13 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}.{{minor}}.{{patch}}
-      
+
       - name: Create manifest list and push # combines the downloaded amd64 and arm64 digests and pushes multi-architecture manifest with the tags specified above
         working-directory: ${{ runner.temp }}/digests/${{ matrix.registry }}
         run: |
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(printf '${{ matrix.registry }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)
-        
+
       - name: Inspect image
         run: |
           docker buildx imagetools inspect ${{ matrix.registry }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}

Makefile

@@ -29,10 +29,10 @@
 
 PROJECT_NAME = fabric-ca
 
-GO_VER = 1.23.5
+GO_VER = 1.25.3
 UBUNTU_VER ?= 22.04
 DEBIAN_VER ?= stretch
-BASE_VERSION ?= v1.5.15
+BASE_VERSION ?= v1.5.16
 
 ARCH=$(shell go env GOARCH)
 PLATFORM=$(shell go env GOOS)-$(shell go env GOARCH)
@@ -42,7 +42,7 @@ PLATFORM=$(shell go env GOOS)-$(shell go env GOARCH)
 RELEASE_VERSION=$(shell echo $(BASE_VERSION) | sed -e  's/^v\(.*\)/\1/')
 PROJECT_VERSION=${RELEASE_VERSION}
 
-PG_VER=13
+PG_VER=17
 
 PKGNAME = github.com/hyperledger/$(PROJECT_NAME)
 

README.md

@@ -12,7 +12,7 @@ The remainder of this guide is intended for developers contributing to Fabric CA
 
 ## Prerequisites
 
-* Go 1.23 installation or later
+* Go 1.25 installation or later
 * docker version 17.03 or later
 * docker-compose version 1.11 or later
 

go.mod

@@ -1,11 +1,13 @@
 module github.com/hyperledger/fabric-ca
 
-go 1.23.5
+go 1.24.0
+
+toolchain go1.25.3
 
 require (
-	github.com/IBM/idemix v0.0.2-0.20231011101252-a4feda90f3f7
-	github.com/IBM/idemix/bccsp/types v0.0.0-20240612072411-114d281b442d
-	github.com/IBM/mathlib v0.0.3-0.20231011094432-44ee0eb539da
+	github.com/IBM/idemix v0.0.2-0.20240913182345-72941a5f41cd
+	github.com/IBM/idemix/bccsp/types v0.0.0-20240913182345-72941a5f41cd
+	github.com/IBM/mathlib v0.0.3-0.20250709075152-a138079496c3
 	github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible
 	github.com/cloudflare/cfssl v1.4.1
 	github.com/felixge/httpsnoop v1.0.1
@@ -23,42 +25,40 @@ require (
 	github.com/lib/pq v1.8.0
 	github.com/mattn/go-sqlite3 v1.14.18
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/onsi/ginkgo v1.14.2
-	github.com/onsi/gomega v1.31.0
+	github.com/onsi/ginkgo v1.16.5
+	github.com/onsi/gomega v1.38.2
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/pkg/errors v0.9.1
 	github.com/pkg/profile v1.5.0
 	github.com/prometheus/client_golang v1.11.1
-	github.com/spf13/cobra v1.5.0
-	github.com/spf13/pflag v1.0.5
+	github.com/spf13/cobra v1.8.1
+	github.com/spf13/pflag v1.0.6
 	github.com/spf13/viper v1.7.0
-	github.com/stretchr/testify v1.8.4
-	golang.org/x/crypto v0.36.0
+	github.com/stretchr/testify v1.11.1
+	golang.org/x/crypto v0.43.0
 	gopkg.in/ldap.v2 v2.5.1
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
 	github.com/IBM/idemix/bccsp/schemes/weak-bb v0.0.0-20240612072411-114d281b442d // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bits-and-blooms/bitset v1.13.0 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/consensys/bavard v0.1.13 // indirect
-	github.com/consensys/gnark-crypto v0.12.1 // indirect
+	github.com/bits-and-blooms/bitset v1.20.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/consensys/gnark-crypto v0.19.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/google/certificate-transparency-go v1.0.21 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548 // indirect
 	github.com/kilic/bls12-381 v0.1.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/miekg/pkcs11 v1.1.1 // indirect
-	github.com/mmcloughlin/addchain v0.4.0 // indirect
-	github.com/nxadm/tail v1.4.4 // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
@@ -67,22 +67,22 @@ require (
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/sykesm/zap-logfmt v0.0.4 // indirect
 	github.com/weppos/publicsuffix-go v0.5.0 // indirect
 	github.com/zmap/zcrypto v0.0.0-20190729165852-9051775e6a2e // indirect
 	github.com/zmap/zlint v0.0.0-20190806154020-fd021b4cfbeb // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/net v0.38.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
-	golang.org/x/text v0.23.0 // indirect
-	google.golang.org/grpc v1.64.1 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	golang.org/x/net v0.45.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/text v0.30.0 // indirect
+	google.golang.org/grpc v1.65.0 // indirect
+	google.golang.org/protobuf v1.36.7 // indirect
 	gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	rsc.io/tmplfunc v0.0.3 // indirect
 )