@@ -9,7 +9,6 @@ package idemix
99import (
1010 "fmt"
1111
12- msp "github.com/IBM/idemix"
1312 csp "github.com/IBM/idemix/bccsp/types"
1413 math "github.com/IBM/mathlib"
1514 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash"
@@ -24,43 +23,61 @@ type Deserializer struct {
2423}
2524
2625// NewDeserializer returns a new deserializer for the idemix ExpectEidNymRhNym verification strategy
27- func NewDeserializer (ipk []byte , curveID math.CurveID ) (* Deserializer , error ) {
26+ func NewDeserializer (
27+ sm SchemaManager ,
28+ schema string ,
29+ ipk []byte ,
30+ curveID math.CurveID ,
31+ ) (* Deserializer , error ) {
2832 logger .Debugf ("new deserialized for dlog idemix" )
2933 cryptoProvider , err := msp2 .NewBCCSPWithDummyKeyStore (curveID , curveID == math .BLS12_381_BBS )
3034 if err != nil {
3135 return nil , errors .WithMessagef (err , "failed to instantiate crypto provider for curve [%d]" , curveID )
3236 }
33- return NewDeserializerWithProvider (ipk , csp .ExpectEidNymRhNym , nil , cryptoProvider )
37+ return NewDeserializerWithProvider (sm , schema , ipk , csp .ExpectEidNymRhNym , nil , cryptoProvider )
3438}
3539
3640// NewDeserializerWithProvider returns a new serialized for the passed arguments
3741func NewDeserializerWithProvider (
42+ sm SchemaManager ,
43+ schema string ,
3844 ipk []byte ,
3945 verType csp.VerificationType ,
4046 nymEID []byte ,
4147 cryptoProvider csp.BCCSP ,
4248) (* Deserializer , error ) {
43- return NewDeserializerWithBCCSP (ipk , verType , nymEID , cryptoProvider )
49+ return NewDeserializerWithBCCSP (
50+ sm ,
51+ schema ,
52+ ipk ,
53+ verType ,
54+ nymEID ,
55+ cryptoProvider ,
56+ )
4457}
4558
46- func NewDeserializerWithBCCSP (ipk []byte , verType csp.VerificationType , nymEID []byte , cryptoProvider csp.BCCSP ) (* Deserializer , error ) {
59+ func NewDeserializerWithBCCSP (
60+ sm SchemaManager ,
61+ schema string ,
62+ ipk []byte ,
63+ verType csp.VerificationType ,
64+ nymEID []byte ,
65+ cryptoProvider csp.BCCSP ,
66+ ) (* Deserializer , error ) {
4767 logger .Debugf ("Setting up Idemix-based MSP instance" )
4868
4969 // Import Issuer Public Key
5070 var issuerPublicKey csp.Key
51- var err error
5271 if len (ipk ) != 0 {
72+ // get the opts from the schema manager
73+ opts , err := sm .PublicKeyImportOpts (schema )
74+ if err != nil {
75+ return nil , errors .Wrapf (err , "could not obtain PublicKeyImportOpts for schema '%s'" , schema )
76+ }
5377 issuerPublicKey , err = cryptoProvider .KeyImport (
5478 ipk ,
55- & csp.IdemixIssuerPublicKeyImportOpts {
56- Temporary : true ,
57- AttributeNames : []string {
58- msp .AttributeNameOU ,
59- msp .AttributeNameRole ,
60- msp .AttributeNameEnrollmentId ,
61- msp .AttributeNameRevocationHandle ,
62- },
63- })
79+ opts ,
80+ )
6481 if err != nil {
6582 return nil , err
6683 }
@@ -73,58 +90,64 @@ func NewDeserializerWithBCCSP(ipk []byte, verType csp.VerificationType, nymEID [
7390 IssuerPublicKey : issuerPublicKey ,
7491 VerType : verType ,
7592 NymEID : nymEID ,
93+ SchemaManager : sm ,
94+ Schema : schema ,
7695 },
7796 }, nil
7897}
7998
80- func (i * Deserializer ) DeserializeVerifier (raw driver.Identity ) (driver.Verifier , error ) {
81- identity , err := i .Deserialize (raw , true )
99+ func (d * Deserializer ) DeserializeVerifier (raw driver.Identity ) (driver.Verifier , error ) {
100+ identity , err := d .Deserialize (raw , true )
82101 if err != nil {
83102 return nil , err
84103 }
85104
86105 return & msp2.NymSignatureVerifier {
87- CSP : i .Deserializer .Csp ,
88- IPK : i .Deserializer .IssuerPublicKey ,
89- NymPK : identity .NymPublicKey ,
106+ CSP : d .Deserializer .Csp ,
107+ IPK : d .Deserializer .IssuerPublicKey ,
108+ NymPK : identity .NymPublicKey ,
109+ SchemaManager : d .SchemaManager ,
110+ Schema : d .Schema ,
90111 }, nil
91112}
92113
93- func (i * Deserializer ) DeserializeVerifierAgainstNymEID (raw []byte , nymEID []byte ) (driver.Verifier , error ) {
94- identity , err := i .Deserializer .DeserializeAgainstNymEID (raw , true , nymEID )
114+ func (d * Deserializer ) DeserializeVerifierAgainstNymEID (raw []byte , nymEID []byte ) (driver.Verifier , error ) {
115+ identity , err := d .Deserializer .DeserializeAgainstNymEID (raw , true , nymEID )
95116 if err != nil {
96117 return nil , err
97118 }
98119
99120 return & msp2.NymSignatureVerifier {
100- CSP : i .Deserializer .Csp ,
101- IPK : i .Deserializer .IssuerPublicKey ,
102- NymPK : identity .NymPublicKey ,
121+ CSP : d .Deserializer .Csp ,
122+ IPK : d .Deserializer .IssuerPublicKey ,
123+ NymPK : identity .NymPublicKey ,
124+ SchemaManager : d .SchemaManager ,
125+ Schema : d .Schema ,
103126 }, nil
104127}
105128
106- func (i * Deserializer ) DeserializeSigner (raw []byte ) (driver.Signer , error ) {
129+ func (d * Deserializer ) DeserializeSigner (raw []byte ) (driver.Signer , error ) {
107130 return nil , errors .New ("not supported" )
108131}
109132
110- func (i * Deserializer ) DeserializeAuditInfo (raw []byte ) (driver2.AuditInfo , error ) {
111- return i .Deserializer .DeserializeAuditInfo (raw )
133+ func (d * Deserializer ) DeserializeAuditInfo (raw []byte ) (driver2.AuditInfo , error ) {
134+ return d .Deserializer .DeserializeAuditInfo (raw )
112135}
113136
114- func (i * Deserializer ) GetOwnerMatcher (raw []byte ) (driver.Matcher , error ) {
115- return i .Deserializer .DeserializeAuditInfo (raw )
137+ func (d * Deserializer ) GetOwnerMatcher (raw []byte ) (driver.Matcher , error ) {
138+ return d .Deserializer .DeserializeAuditInfo (raw )
116139}
117140
118- func (i * Deserializer ) GetOwnerAuditInfo (raw []byte , p driver.AuditInfoProvider ) ([][]byte , error ) {
141+ func (d * Deserializer ) GetOwnerAuditInfo (raw []byte , p driver.AuditInfoProvider ) ([][]byte , error ) {
119142 auditInfo , err := p .GetAuditInfo (raw )
120143 if err != nil {
121144 return nil , errors .Wrapf (err , "failed getting audit info for recipient identity [%s]" , driver .Identity (raw ).String ())
122145 }
123146 return [][]byte {auditInfo }, nil
124147}
125148
126- func (i * Deserializer ) Info (raw []byte , auditInfo []byte ) (string , error ) {
127- r , err := i .Deserialize (raw , false )
149+ func (d * Deserializer ) Info (raw []byte , auditInfo []byte ) (string , error ) {
150+ r , err := d .Deserialize (raw , false )
128151 if err != nil {
129152 return "" , err
130153 }
@@ -135,6 +158,8 @@ func (i *Deserializer) Info(raw []byte, auditInfo []byte) (string, error) {
135158 if err != nil {
136159 return "" , err
137160 }
161+ ai .SchemaManager = d .Deserializer .SchemaManager
162+ ai .Schema = d .Deserializer .Schema
138163 if err := ai .Match (raw ); err != nil {
139164 return "" , err
140165 }
@@ -144,8 +169,8 @@ func (i *Deserializer) Info(raw []byte, auditInfo []byte) (string, error) {
144169 return fmt .Sprintf ("MSP.Idemix: [%s][%s][%s][%s][%s]" , eid , driver .Identity (raw ).UniqueID (), r .SerializedIdentity .Mspid , r .OU .OrganizationalUnitIdentifier , r .Role .Role .String ()), nil
145170}
146171
147- func (i * Deserializer ) String () string {
148- return fmt .Sprintf ("Idemix with IPK [%s]" , hash .Hashable (i .Ipk ).String ())
172+ func (d * Deserializer ) String () string {
173+ return fmt .Sprintf ("Idemix with IPK [%s]" , hash .Hashable (d .Ipk ).String ())
149174}
150175
151176type AuditInfoDeserializer struct {}
0 commit comments