[FAB-10485] Revendor Idemix Library

The Idemix library in fabric has been updated. The Idemix library in Fabric CA vendored again to keep the versions in sync. Change-Id: I8cb9216c5a34d5da6a166febe36da3582a512e04 Signed-off-by: Saad Karim <[email protected]>
hyperledger · Jul 9, 2018 · 6b86289 · 6b86289
1 parent 9e11a65
commit 6b86289
Show file tree

Hide file tree

Showing 22 changed files with 381 additions and 592 deletions.
diff --git a/lib/server/idemix/enroll.go b/lib/server/idemix/enroll.go
@@ -86,7 +86,7 @@ func (h *EnrollRequestHandler) HandleRequest() (*EnrollmentResponse, error) {
 	}
 
 	// Check the if credential request is valid
-	err = req.CredRequest.Check(ik.GetIPk())
+	err = req.CredRequest.Check(ik.GetIpk())
 	if err != nil {
 		log.Errorf("Invalid Idemix credential request: %s", err.Error())
 		return nil, errors.WithMessage(err, "Invalid Idemix credential request")
@@ -99,7 +99,7 @@ func (h *EnrollRequestHandler) HandleRequest() (*EnrollmentResponse, error) {
 	}
 
 	// Get attributes for the identity
-	attrMap, attrs, err := h.GetAttributeValues(caller, ik.GetIPk(), rh)
+	attrMap, attrs, err := h.GetAttributeValues(caller, ik.GetIpk(), rh)
 	if err != nil {
 		return nil, err
 	}

diff --git a/lib/server/idemix/enroll_test.go b/lib/server/idemix/enroll_test.go
@@ -290,7 +290,7 @@ func TestHandleIdemixEnrollNewCredError(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to create test credential request")
 	}
-	_, attrs, err := handler.GetAttributeValues(caller, ik.IPk, rh)
+	_, attrs, err := handler.GetAttributeValues(caller, ik.Ipk, rh)
 	if err != nil {
 		t.Fatalf("Failed to get attributes")
 	}
@@ -354,7 +354,7 @@ func TestHandleIdemixEnrollInsertCredError(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to create test credential request")
 	}
-	_, attrs, err := handler.GetAttributeValues(caller, ik.IPk, rh)
+	_, attrs, err := handler.GetAttributeValues(caller, ik.Ipk, rh)
 	if err != nil {
 		t.Fatalf("Failed to get attributes")
 	}
@@ -434,7 +434,7 @@ func TestHandleIdemixEnrollForCredentialSuccess(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to create test credential request")
 	}
-	_, attrs, err := handler.GetAttributeValues(caller, ik.IPk, rh)
+	_, attrs, err := handler.GetAttributeValues(caller, ik.Ipk, rh)
 	if err != nil {
 		t.Fatalf("Failed to get attributes")
 	}
@@ -543,5 +543,5 @@ func newIdemixCredentialRequest(t *testing.T, nonce *fp256bn.BIG) (*idemix.CredR
 		return nil, nil, err
 	}
 	sk := idemix.RandModOrder(rng)
-	return idemix.NewCredRequest(sk, nonce, ik.IPk, rng), sk, nil
+	return idemix.NewCredRequest(sk, nonce, ik.Ipk, rng), sk, nil
 }
diff --git a/lib/server/idemix/issuer.go b/lib/server/idemix/issuer.go
@@ -137,7 +137,7 @@ func (i *issuer) IssuerPublicKey() ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	ipkBytes, err := proto.Marshal(ik.IPk)
+	ipkBytes, err := proto.Marshal(ik.Ipk)
 	if err != nil {
 		return nil, err
 	}
@@ -235,7 +235,7 @@ func (i *issuer) VerifyToken(authHdr string, body []byte) (string, error) {
 	if err != nil {
 		return "", errors.WithMessage(err, "Failed to unmarshal signature bytes specified in the token")
 	}
-	err = sig.Ver(disclosure, issuerKey.IPk, digest, attrs, 3, ra.PublicKey(), epoch)
+	err = sig.Ver(disclosure, issuerKey.Ipk, digest, attrs, 3, ra.PublicKey(), epoch)
 	if err != nil {
 		return "", errors.WithMessage(err, "Failed to verify the token")
 	}

diff --git a/lib/server/idemix/issuer_whitebox_test.go b/lib/server/idemix/issuer_whitebox_test.go
@@ -94,7 +94,7 @@ func TestIssuerPublicKey(t *testing.T) {
 		t.Fatalf("Failed to load issuer credential: %s", err.Error())
 	}
 	ik, _ := issuerCred.GetIssuerKey()
-	ik.IPk = nil
+	ik.Ipk = nil
 	_, err = issuer.IssuerPublicKey()
 	assert.Error(t, err, "issuer.IssuerCredential() should return an error as it should fail to marshal issuer public key")
 }

diff --git a/lib/server/idemix/issuercredential.go b/lib/server/idemix/issuercredential.go
@@ -86,8 +86,8 @@ func (ic *caIdemixCredential) Load() error {
 		return errors.New("Issuer secret key file is empty")
 	}
 	ic.issuerKey = &idemix.IssuerKey{
-		IPk: pubKey,
-		ISk: privKey,
+		Ipk: pubKey,
+		Isk: privKey,
 	}
 	//TODO: check if issuer key is valid by checking public and secret key pair
 	return nil
@@ -101,7 +101,7 @@ func (ic *caIdemixCredential) Store() error {
 		return err
 	}
 
-	ipkBytes, err := proto.Marshal(ik.IPk)
+	ipkBytes, err := proto.Marshal(ik.Ipk)
 	if err != nil {
 		return errors.New("Failed to marshal Issuer public key")
 	}
@@ -112,7 +112,7 @@ func (ic *caIdemixCredential) Store() error {
 		return errors.New("Failed to store Issuer public key")
 	}
 
-	err = util.WriteFile(ic.secretKeyFile, ik.ISk, 0644)
+	err = util.WriteFile(ic.secretKeyFile, ik.Isk, 0644)
 	if err != nil {
 		log.Errorf("Failed to store Issuer secret key: %s", err.Error())
 		return errors.New("Failed to store Issuer secret key")

diff --git a/lib/server/idemix/issuercredential_test.go b/lib/server/idemix/issuercredential_test.go
@@ -165,7 +165,7 @@ func TestStoreReadonlyPublicKeyFilePath(t *testing.T) {
 		t.Fatalf("Failed to create read only directory: %s", err.Error())
 	}
 	ik := NewIssuerCredential(pubkeyfile, testSecretKeyFile, idemixLib)
-	ik.SetIssuerKey(&idemix.IssuerKey{IPk: pubKey})
+	ik.SetIssuerKey(&idemix.IssuerKey{Ipk: pubKey})
 	err = ik.Store()
 	assert.Error(t, err, "Should fail if issuer public key is being stored to readonly directory")
 	if err != nil {
@@ -200,7 +200,7 @@ func TestStoreReadonlySecretKeyFilePath(t *testing.T) {
 		t.Fatalf("Failed to create read only directory: %s", err.Error())
 	}
 	ik := NewIssuerCredential(testPublicKeyFile, privkeyfile, idemixLib)
-	ik.SetIssuerKey(&idemix.IssuerKey{IPk: pubKey})
+	ik.SetIssuerKey(&idemix.IssuerKey{Ipk: pubKey})
 	err = ik.Store()
 	assert.Error(t, err, "Should fail if issuer secret key is being stored to read-only directory")
 	if err != nil {

diff --git a/lib/server/idemix/revocationauthority.go b/lib/server/idemix/revocationauthority.go
@@ -167,9 +167,6 @@ func (ra *revocationAuthority) CreateCRI() (*idemix.CredentialRevocationInformat
 	unrevokedHandles := ra.getUnRevokedHandles(info, revokedCreds)
 
 	alg := idemix.ALG_NO_REVOCATION
-	if len(revokedCreds) > 0 {
-		alg = idemix.ALG_PLAIN_SIGNATURE
-	}
 	cri, err := ra.issuer.IdemixLib().CreateCRI(ra.key.GetKey(), unrevokedHandles, info.Epoch, alg, ra.issuer.IdemixRand())
 	if err != nil {
 		return nil, err

diff --git a/lib/server/idemix/revocationauthority_test.go b/lib/server/idemix/revocationauthority_test.go
@@ -703,10 +703,6 @@ func getRevocationAuthority(t *testing.T, homeDir string, db *dmocks.FabricCADB,
 		validHandles = append(validHandles, fp256bn.NewBIGint(i))
 	}
 	alg := idemix.ALG_NO_REVOCATION
-	if revokedCred > 0 {
-		validHandles = append(validHandles[:revokedCred], validHandles[revokedCred+1:]...)
-		alg = idemix.ALG_PLAIN_SIGNATURE
-	}
 	if idemixCreateCRIError {
 		lib.On("CreateCRI", revocationKey, validHandles, 1, alg, rnd).Return(nil, errors.New("Idemix lib create CRI error"))
 	} else {

diff --git a/vendor/github.com/hyperledger/fabric/idemix/credential.go b/vendor/github.com/hyperledger/fabric/idemix/credential.go
diff --git a/vendor/github.com/hyperledger/fabric/idemix/credrequest.go b/vendor/github.com/hyperledger/fabric/idemix/credrequest.go