Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.

Commit 43ff3e8

Browse files
committed
[FAB-10195] Bump to fabric 1.2 RC1
Change-Id: Iebdba5b9b9bf3ad65cbc6aec565a179126ccb4bc Signed-off-by: Troy Ronda <troy@troyronda.com>
1 parent e529e89 commit 43ff3e8

File tree

5 files changed

+25
-34
lines changed

5 files changed

+25
-34
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ FABRIC_DEV_REGISTRY_PRE_CMD ?= docker login -u docker -p docker nexus3.hyperledg
6464

6565
# Upstream fabric patching (overridable)
6666
THIRDPARTY_FABRIC_CA_BRANCH ?= master
67-
THIRDPARTY_FABRIC_CA_COMMIT ?= 7c3fc1addc046055f66d45d35a1c47c98364c627
67+
THIRDPARTY_FABRIC_CA_COMMIT ?= v1.2.0-rc1
6868
THIRDPARTY_FABRIC_BRANCH ?= master
69-
THIRDPARTY_FABRIC_COMMIT ?= 8f79ea1aebdaee1c844d1b5f2c8f89dff18bcffc
69+
THIRDPARTY_FABRIC_COMMIT ?= v1.2.0-rc1
7070

7171
# Force removal of images in cleanup (overridable)
7272
FIXTURE_DOCKER_REMOVE_FORCE ?= false

internal/github.com/hyperledger/fabric-ca/api/client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ type EnrollmentRequest struct {
6868
Label string `json:"label,omitempty" help:"Label to use in HSM operations"`
6969
// CSR is Certificate Signing Request info
7070
CSR *CSRInfo `json:"csr,omitempty" help:"Certificate Signing Request info"`
71-
// The type of the enrollment request: x509 or idemix
71+
// The type of the enrollment request
7272
// The default is a request for an X509 enrollment certificate
73-
Type string `def:"x509" help:"The type of enrollment request: 'x509' or 'idemix'"`
73+
Type string `def:"x509" help:"The type of enrollment request"`
7474
}
7575

7676
func (er EnrollmentRequest) String() string {

internal/github.com/hyperledger/fabric-ca/lib/client.go

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -207,20 +207,20 @@ func (c *Client) net2LocalCAInfo(net *common.CAInfoResponseNet, local *GetCAInfo
207207
if err != nil {
208208
return errors.WithMessage(err, "Failed to decode CA chain")
209209
}
210-
if net.IssuerPublicKey != "" {
211-
ipk, err := util.B64Decode(net.IssuerPublicKey)
212-
if err != nil {
213-
return errors.WithMessage(err, "Failed to decode issuer public key")
214-
}
215-
local.IssuerPublicKey = ipk
216-
}
217-
if net.IssuerRevocationPublicKey != "" {
218-
rpk, err := util.B64Decode(net.IssuerRevocationPublicKey)
219-
if err != nil {
220-
return errors.WithMessage(err, "Failed to decode issuer revocation key")
221-
}
222-
local.IssuerRevocationPublicKey = rpk
223-
}
210+
// if net.IssuerPublicKey != "" {
211+
// ipk, err := util.B64Decode(net.IssuerPublicKey)
212+
// if err != nil {
213+
// return errors.WithMessage(err, "Failed to decode issuer public key")
214+
// }
215+
// local.IssuerPublicKey = ipk
216+
// }
217+
// if net.IssuerRevocationPublicKey != "" {
218+
// rpk, err := util.B64Decode(net.IssuerRevocationPublicKey)
219+
// if err != nil {
220+
// return errors.WithMessage(err, "Failed to decode issuer revocation key")
221+
// }
222+
// local.IssuerRevocationPublicKey = rpk
223+
// }
224224
local.CAName = net.CAName
225225
local.CAChain = caChain
226226
local.Version = net.Version
@@ -274,6 +274,7 @@ func (c *Client) handleX509Enroll(req *api.EnrollmentRequest) (*EnrollmentRespon
274274
// 3. Sends a request with the CredentialRequest object in the body to the
275275
// /api/v1/idemix/credentail REST endpoint to get a credential
276276
func (c *Client) handleIdemixEnroll(req *api.EnrollmentRequest) (*EnrollmentResponse, error) {
277+
log.Infof("Successfully received Idemix credential from CA %s", req.CAName)
277278
return nil, errors.New("idemix enroll not supported")
278279
}
279280

internal/github.com/hyperledger/fabric-ca/lib/common/serverresponses.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ type CAInfoResponseNet struct {
2121
CAName string
2222
// Base64 encoding of PEM-encoded certificate chain
2323
CAChain string
24-
// Base64 encoding of Idemix issuer public key
25-
IssuerPublicKey string
26-
// Base64 encoding of PEM-encoded Idemix issuer revocation public key
27-
IssuerRevocationPublicKey string
24+
// // Base64 encoding of Idemix issuer public key
25+
// IssuerPublicKey string
26+
// // Base64 encoding of PEM-encoded Idemix issuer revocation public key
27+
// IssuerRevocationPublicKey string
2828
// Version of the server
2929
Version string
3030
}

internal/github.com/hyperledger/fabric/events/consumer/consumer.go

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
/*
2-
Copyright IBM Corp. 2016 All Rights Reserved.
2+
Copyright IBM Corp. All Rights Reserved.
33
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
4+
SPDX-License-Identifier: Apache-2.0
155
*/
166
/*
177
Notice: This file has been modified for Hyperledger Fabric SDK Go usage.

0 commit comments

Comments
 (0)