[FABG-924] Apply upstream

Signed-off-by: Aleksandar Likic <aleksandar.likic@securekey.com>
hyperledger · Dec 7, 2019 · ba12471 · ba12471
1 parent fe2f155
commit ba12471
Show file tree

Hide file tree

Showing 136 changed files with 5,004 additions and 1,178 deletions.
diff --git a/internal/github.com/hyperledger/fabric-ca/api/client.go b/internal/github.com/hyperledger/fabric-ca/api/client.go
@@ -15,7 +15,7 @@ import (
 	"time"
 
 	"github.com/cloudflare/cfssl/csr"
-	"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/util"
+	"github.com/hyperledger/fabric-ca/util"
 )
 
 // RegistrationRequest for a new identity

diff --git a/internal/github.com/hyperledger/fabric-ca/api/net.go b/internal/github.com/hyperledger/fabric-ca/api/net.go
@@ -22,6 +22,7 @@ package api
 
 import (
 	"github.com/cloudflare/cfssl/signer"
+	"github.com/hyperledger/fabric/idemix"
 )
 
 /*
@@ -47,6 +48,12 @@ type EnrollmentRequestNet struct {
 	AttrReqs []*AttributeRequest `json:"attr_reqs,omitempty"`
 }
 
+// IdemixEnrollmentRequestNet is a request to enroll an identity and get idemix credential
+type IdemixEnrollmentRequestNet struct {
+	*idemix.CredRequest `json:"request"`
+	CAName              string `json:"caname"`
+}
+
 // ReenrollmentRequestNet is a request to reenroll an identity.
 // This is useful to renew a certificate before it has expired.
 type ReenrollmentRequestNet struct {