Merge "Use protobufs to serialize identities"

msp/identities.go

@@ -23,10 +23,9 @@ import (
 
 	"encoding/pem"
 
-	"encoding/asn1"
-
 	"errors"
 
+	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/core/crypto/bccsp"
 	"github.com/hyperledger/fabric/core/crypto/bccsp/signer"
 )
@@ -115,8 +114,8 @@ func (id *identity) Serialize() ([]byte, error) {
 	}
 
 	// We serialize identities by prepending the MSPID and appending the ASN.1 DER content of the cert
-	sId := SerializedIdentity{Mspid: id.id.Mspid, IdBytes: pemBytes}
-	idBytes, err := asn1.Marshal(sId)
+	sId := &SerializedIdentity{Mspid: id.id.Mspid, IdBytes: pemBytes}
+	idBytes, err := proto.Marshal(sId)
 	if err != nil {
 		return nil, fmt.Errorf("Could not marshal a SerializedIdentity structure for identity %s, err %s", id.id, err)
 	}

msp/identities.proto

@@ -0,0 +1,32 @@
+/*
+Copyright IBM Corp. 2016 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.
+*/
+
+syntax = "proto3";
+
+option go_package = "github.com/hyperledger/fabric/msp";
+
+package msp;
+
+// This struct represents an Identity
+// (with its MSP identifier) to be used
+// to serialize it and deserialize it
+message SerializedIdentity {
+	// The identifier of the associated membership service provider
+    string Mspid = 1;
+
+    // the Identity, serialized according to the rules of its MPS
+    bytes IdBytes = 2;
+}

msp/msp.go

@@ -223,14 +223,3 @@ const (
 	FABRIC ProviderType = iota // MSP is of FABRIC type
 	OTHER                      // MSP is of OTHER TYPE
 )
-
-// This struct represents an Identity
-// (with its MSP identifier) to be used
-// to serialize it and deserialize it
-type SerializedIdentity struct {
-	// The identifier of the associated membership service provider
-	Mspid string
-
-	// the Identity, serialized according to the rules of its MPS
-	IdBytes []byte
-}

msp/mspimpl.go

@@ -25,8 +25,7 @@ import (
 
 	"encoding/json"
 
-	"encoding/asn1"
-
+	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/core/crypto/bccsp"
 	"github.com/hyperledger/fabric/core/crypto/bccsp/signer"
 	"github.com/hyperledger/fabric/core/crypto/bccsp/sw"
@@ -263,7 +262,7 @@ func (msp *bccspmsp) DeserializeIdentity(serializedID []byte) (Identity, error)
 
 	// We first deserialize to a SerializedIdentity to get the MSP ID
 	sId := &SerializedIdentity{}
-	_, err := asn1.Unmarshal(serializedID, sId)
+	err := proto.Unmarshal(serializedID, sId)
 	if err != nil {
 		return nil, fmt.Errorf("Could not deserialize a SerializedIdentity, err %s", err)
 	}

msp/mspmgrimpl.go

@@ -19,8 +19,7 @@ package msp
 import (
 	"fmt"
 
-	"encoding/asn1"
-
+	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/protos/msp"
 	"github.com/op/go-logging"
 )
@@ -106,7 +105,7 @@ func (mgr *mspManagerImpl) GetMSPs() (map[string]MSP, error) {
 func (mgr *mspManagerImpl) DeserializeIdentity(serializedID []byte) (Identity, error) {
 	// We first deserialize to a SerializedIdentity to get the MSP ID
 	sId := &SerializedIdentity{}
-	_, err := asn1.Unmarshal(serializedID, sId)
+	err := proto.Unmarshal(serializedID, sId)
 	if err != nil {
 		return nil, fmt.Errorf("Could not deserialize a SerializedIdentity, err %s", err)
 	}