Merge "core/crypto/primitives cleanup: second step"

accesscontrol/api.go

@@ -1,3 +1,18 @@
+/*
+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.
+*/
 package accesscontrol
 
 // Attribute defines a name, value pair to be verified.

core/crypto/attributes/attributes.go → accesscontrol/attributes/attributes.go

@@ -25,10 +25,11 @@ import (
 	"strconv"
 	"strings"
 
-	pb "github.com/hyperledger/fabric/core/crypto/attributes/proto"
+	pb "github.com/hyperledger/fabric/accesscontrol/attributes/proto"
 	"github.com/hyperledger/fabric/core/crypto/primitives"
 
 	"github.com/golang/protobuf/proto"
+	"github.com/hyperledger/fabric/accesscontrol/crypto/utils"
 )
 
 var (
@@ -80,7 +81,7 @@ func ReadAttributeHeader(tcert *x509.Certificate, headerKey []byte) (map[string]
 	var err error
 	var headerRaw []byte
 	encrypted := false
-	if headerRaw, err = primitives.GetCriticalExtension(tcert, TCertAttributesHeaders); err != nil {
+	if headerRaw, err = utils.GetCriticalExtension(tcert, TCertAttributesHeaders); err != nil {
 		return nil, encrypted, err
 	}
 	headerStr := string(headerRaw)
@@ -112,7 +113,7 @@ func ReadTCertAttributeByPosition(tcert *x509.Certificate, position int) ([]byte
 	}
 
 	oid := asn1.ObjectIdentifier{1, 2, 3, 4, 5, 6, 9 + position}
-	value, err := primitives.GetCriticalExtension(tcert, oid)
+	value, err := utils.GetCriticalExtension(tcert, oid)
 	if err != nil {
 		return nil, err
 	}
@@ -139,7 +140,7 @@ func ReadTCertAttribute(tcert *x509.Certificate, attributeName string, headerKey
 //EncryptAttributeValue encrypts "attributeValue" using "attributeKey"
 func EncryptAttributeValue(attributeKey []byte, attributeValue []byte) ([]byte, error) {
 	value := append(attributeValue, padding...)
-	return primitives.CBCPKCS7Encrypt(attributeKey, value)
+	return utils.CBCPKCS7Encrypt(attributeKey, value)
 }
 
 //getAttributeKey returns the attributeKey derived from the preK0 to the attributeName.
@@ -155,7 +156,7 @@ func EncryptAttributeValuePK0(preK0 []byte, attributeName string, attributeValue
 
 //DecryptAttributeValue decrypts "encryptedValue" using "attributeKey" and return the decrypted value.
 func DecryptAttributeValue(attributeKey []byte, encryptedValue []byte) ([]byte, error) {
-	value, err := primitives.CBCPKCS7Decrypt(attributeKey, encryptedValue)
+	value, err := utils.CBCPKCS7Decrypt(attributeKey, encryptedValue)
 	if err != nil {
 		return nil, err
 	}
@@ -238,7 +239,7 @@ func CreateAttributesMetadataFromCert(cert *x509.Certificate, metadata []byte, p
 
 //CreateAttributesMetadata create the AttributesMetadata from the original metadata
 func CreateAttributesMetadata(raw []byte, metadata []byte, preK0 []byte, attributeKeys []string) ([]byte, error) {
-	cert, err := primitives.DERToX509Certificate(raw)
+	cert, err := utils.DERToX509Certificate(raw)
 	if err != nil {
 		return nil, err
 	}

core/crypto/attributes/attributes_test.go → accesscontrol/attributes/attributes_test.go

@@ -28,7 +28,7 @@ import (
 	"testing"
 
 	"github.com/golang/protobuf/proto"
-	pb "github.com/hyperledger/fabric/core/crypto/attributes/proto"
+	pb "github.com/hyperledger/fabric/accesscontrol/attributes/proto"
 	"github.com/hyperledger/fabric/core/crypto/primitives"
 )
 

accesscontrol/crypto/attr/attr_support.go

@@ -22,8 +22,8 @@ import (
 	"errors"
 
 	"github.com/hyperledger/fabric/accesscontrol"
-	"github.com/hyperledger/fabric/core/crypto/attributes"
-	"github.com/hyperledger/fabric/core/crypto/primitives"
+	"github.com/hyperledger/fabric/accesscontrol/attributes"
+	"github.com/hyperledger/fabric/accesscontrol/crypto/utils"
 )
 
 // chaincodeHolder is the struct that hold the certificate and the metadata. An implementation is ChaincodeStub
@@ -107,7 +107,7 @@ func NewAttributesHandlerImpl(holder chaincodeHolder) (*AttributesHandlerImpl, e
 		return nil, errors.New("The certificate can't be nil.")
 	}
 	var tcert *x509.Certificate
-	tcert, err = primitives.DERToX509Certificate(certRaw)
+	tcert, err = utils.DERToX509Certificate(certRaw)
 	if err != nil {
 		return nil, err
 	}

accesscontrol/crypto/ecdsa/ecdsa_test.go

@@ -19,20 +19,21 @@ package ecdsa
 import (
 	"testing"
 
+	"github.com/hyperledger/fabric/accesscontrol/crypto/utils"
 	"github.com/hyperledger/fabric/core/crypto/primitives"
 )
 
 func TestSignatureVerifier(t *testing.T) {
 	// Create a signature
 	primitives.SetSecurityLevel("SHA3", 256)
 
-	cert, key, err := primitives.NewSelfSignedCert()
+	cert, key, err := utils.NewSelfSignedCert()
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	message := []byte("Hello World!")
-	signature, err := primitives.ECDSASign(key, message)
+	signature, err := utils.ECDSASign(key, message)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -54,13 +55,13 @@ func TestSignatureVerifierSHA2(t *testing.T) {
 	// Create a signature
 	primitives.SetSecurityLevel("SHA2", 256)
 
-	cert, key, err := primitives.NewSelfSignedCert()
+	cert, key, err := utils.NewSelfSignedCert()
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	message := []byte("Hello World!")
-	signature, err := primitives.ECDSASign(key, message)
+	signature, err := utils.ECDSASign(key, message)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -82,13 +83,13 @@ func TestSignatureVerifierSHA2_384(t *testing.T) {
 	// Create a signature
 	primitives.SetSecurityLevel("SHA2", 384)
 
-	cert, key, err := primitives.NewSelfSignedCert()
+	cert, key, err := utils.NewSelfSignedCert()
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	message := []byte("Hello World!")
-	signature, err := primitives.ECDSASign(key, message)
+	signature, err := utils.ECDSASign(key, message)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -110,13 +111,13 @@ func TestSignatureVerifierSHA3_384(t *testing.T) {
 	// Create a signature
 	primitives.SetSecurityLevel("SHA3", 384)
 
-	cert, key, err := primitives.NewSelfSignedCert()
+	cert, key, err := utils.NewSelfSignedCert()
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	message := []byte("Hello World!")
-	signature, err := primitives.ECDSASign(key, message)
+	signature, err := utils.ECDSASign(key, message)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -138,13 +139,13 @@ func TestSignatureVerifierSHA2_512(t *testing.T) {
 	// Create a signature
 	primitives.SetSecurityLevel("SHA2", 512)
 
-	cert, key, err := primitives.NewSelfSignedCert()
+	cert, key, err := utils.NewSelfSignedCert()
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	message := []byte("Hello World!")
-	signature, err := primitives.ECDSASign(key, message)
+	signature, err := utils.ECDSASign(key, message)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -166,13 +167,13 @@ func TestSignatureVerifierSHA3_512(t *testing.T) {
 	// Create a signature
 	primitives.SetSecurityLevel("SHA3", 512)
 
-	cert, key, err := primitives.NewSelfSignedCert()
+	cert, key, err := utils.NewSelfSignedCert()
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	message := []byte("Hello World!")
-	signature, err := primitives.ECDSASign(key, message)
+	signature, err := utils.ECDSASign(key, message)
 	if err != nil {
 		t.Fatal(err)
 	}

core/crypto/primitives/aes.go → accesscontrol/crypto/utils/aes.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package primitives
+package utils
 
 import (
 	"bytes"
@@ -24,6 +24,8 @@ import (
 	"errors"
 	"fmt"
 	"io"
+
+	"github.com/hyperledger/fabric/core/crypto/primitives"
 )
 
 const (
@@ -36,7 +38,7 @@ const (
 
 // GenAESKey returns a random AES key of length AESKeyLength
 func GenAESKey() ([]byte, error) {
-	return GetRandomBytes(AESKeyLength)
+	return primitives.GetRandomBytes(AESKeyLength)
 }
 
 // PKCS7Padding pads as prescribed by the PKCS7 standard