[FAB-10195] Bump to fabric 1.2 RC1

Change-Id: Iebdba5b9b9bf3ad65cbc6aec565a179126ccb4bc Signed-off-by: Troy Ronda <troy@troyronda.com>
hyperledger · Jun 22, 2018 · 43ff3e8 · 43ff3e8
1 parent e529e89
commit 43ff3e8
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -64,9 +64,9 @@ FABRIC_DEV_REGISTRY_PRE_CMD ?= docker login -u docker -p docker nexus3.hyperledg
 
 # Upstream fabric patching (overridable)
 THIRDPARTY_FABRIC_CA_BRANCH ?= master
-THIRDPARTY_FABRIC_CA_COMMIT ?= 7c3fc1addc046055f66d45d35a1c47c98364c627
+THIRDPARTY_FABRIC_CA_COMMIT ?= v1.2.0-rc1
 THIRDPARTY_FABRIC_BRANCH    ?= master
-THIRDPARTY_FABRIC_COMMIT    ?= 8f79ea1aebdaee1c844d1b5f2c8f89dff18bcffc
+THIRDPARTY_FABRIC_COMMIT    ?= v1.2.0-rc1
 
 # Force removal of images in cleanup (overridable)
 FIXTURE_DOCKER_REMOVE_FORCE ?= false

diff --git a/internal/github.com/hyperledger/fabric-ca/api/client.go b/internal/github.com/hyperledger/fabric-ca/api/client.go
@@ -68,9 +68,9 @@ type EnrollmentRequest struct {
 	Label string `json:"label,omitempty" help:"Label to use in HSM operations"`
 	// CSR is Certificate Signing Request info
 	CSR *CSRInfo `json:"csr,omitempty" help:"Certificate Signing Request info"`
-	// The type of the enrollment request: x509 or idemix
+	// The type of the enrollment request
 	// The default is a request for an X509 enrollment certificate
-	Type string `def:"x509" help:"The type of enrollment request: 'x509' or 'idemix'"`
+	Type string `def:"x509" help:"The type of enrollment request"`
 }
 
 func (er EnrollmentRequest) String() string {

diff --git a/internal/github.com/hyperledger/fabric-ca/lib/client.go b/internal/github.com/hyperledger/fabric-ca/lib/client.go
@@ -207,20 +207,20 @@ func (c *Client) net2LocalCAInfo(net *common.CAInfoResponseNet, local *GetCAInfo
 	if err != nil {
 		return errors.WithMessage(err, "Failed to decode CA chain")
 	}
-	if net.IssuerPublicKey != "" {
-		ipk, err := util.B64Decode(net.IssuerPublicKey)
-		if err != nil {
-			return errors.WithMessage(err, "Failed to decode issuer public key")
-		}
-		local.IssuerPublicKey = ipk
-	}
-	if net.IssuerRevocationPublicKey != "" {
-		rpk, err := util.B64Decode(net.IssuerRevocationPublicKey)
-		if err != nil {
-			return errors.WithMessage(err, "Failed to decode issuer revocation key")
-		}
-		local.IssuerRevocationPublicKey = rpk
-	}
+	// if net.IssuerPublicKey != "" {
+	// 	ipk, err := util.B64Decode(net.IssuerPublicKey)
+	// 	if err != nil {
+	// 		return errors.WithMessage(err, "Failed to decode issuer public key")
+	// 	}
+	// 	local.IssuerPublicKey = ipk
+	// }
+	// if net.IssuerRevocationPublicKey != "" {
+	// 	rpk, err := util.B64Decode(net.IssuerRevocationPublicKey)
+	// 	if err != nil {
+	// 		return errors.WithMessage(err, "Failed to decode issuer revocation key")
+	// 	}
+	// 	local.IssuerRevocationPublicKey = rpk
+	// }
 	local.CAName = net.CAName
 	local.CAChain = caChain
 	local.Version = net.Version
@@ -274,6 +274,7 @@ func (c *Client) handleX509Enroll(req *api.EnrollmentRequest) (*EnrollmentRespon
 // 3. Sends a request with the CredentialRequest object in the body to the
 //    /api/v1/idemix/credentail REST endpoint to get a credential
 func (c *Client) handleIdemixEnroll(req *api.EnrollmentRequest) (*EnrollmentResponse, error) {
+	log.Infof("Successfully received Idemix credential from CA %s", req.CAName)
 	return nil, errors.New("idemix enroll not supported")
 }
 

diff --git a/internal/github.com/hyperledger/fabric-ca/lib/common/serverresponses.go b/internal/github.com/hyperledger/fabric-ca/lib/common/serverresponses.go
@@ -21,10 +21,10 @@ type CAInfoResponseNet struct {
 	CAName string
 	// Base64 encoding of PEM-encoded certificate chain
 	CAChain string
-	// Base64 encoding of Idemix issuer public key
-	IssuerPublicKey string
-	// Base64 encoding of PEM-encoded Idemix issuer revocation public key
-	IssuerRevocationPublicKey string
+	// // Base64 encoding of Idemix issuer public key
+	// IssuerPublicKey string
+	// // Base64 encoding of PEM-encoded Idemix issuer revocation public key
+	// IssuerRevocationPublicKey string
 	// Version of the server
 	Version string
 }

diff --git a/internal/github.com/hyperledger/fabric/events/consumer/consumer.go b/internal/github.com/hyperledger/fabric/events/consumer/consumer.go
@@ -1,17 +1,7 @@
 /*
-Copyright IBM Corp. 2016 All Rights Reserved.
+Copyright IBM Corp. All Rights Reserved.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-		 http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+SPDX-License-Identifier: Apache-2.0
 */
 /*
 Notice: This file has been modified for Hyperledger Fabric SDK Go usage.