Merge pull request #1 from loomnetwork/secp256k1

Added secp256k1 supporting
This commit is contained in:
Matthew Campbell 2018-12-05 21:26:40 +07:00 committed by GitHub
commit fa21710f0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 63 additions and 9 deletions

View File

@ -77,6 +77,20 @@ func CreateSignDataEddsaCommand(keyID uint16, data []byte) (*CommandMessage, err
return command, nil return command, nil
} }
func CreateSignDataEcdsaCommand(keyID uint16, data []byte) (*CommandMessage, error) {
command := &CommandMessage{
CommandType: CommandTypeSignDataEcdsa,
}
payload := bytes.NewBuffer([]byte{})
binary.Write(payload, binary.BigEndian, keyID)
payload.Write(data)
command.Data = payload.Bytes()
return command, nil
}
func CreatePutAsymmetricKeyCommand(keyID uint16, label []byte, domains uint16, capabilities uint64, algorithm Algorithm, keyPart1 []byte, keyPart2 []byte) (*CommandMessage, error) { func CreatePutAsymmetricKeyCommand(keyID uint16, label []byte, domains uint16, capabilities uint64, algorithm Algorithm, keyPart1 []byte, keyPart2 []byte) (*CommandMessage, error) {
if len(label) > LabelLength { if len(label) > LabelLength {
return nil, errors.New("label is too long") return nil, errors.New("label is too long")
@ -124,6 +138,19 @@ func CreateGetPubKeyCommand(keyID uint16) (*CommandMessage, error) {
return command, nil return command, nil
} }
func CreateDeleteObjectCommand(objID uint16, objType uint8) (*CommandMessage, error) {
command := &CommandMessage{
CommandType: CommandTypeDeleteObject,
}
payload := bytes.NewBuffer([]byte{})
binary.Write(payload, binary.BigEndian, objID)
binary.Write(payload, binary.BigEndian, objType)
command.Data = payload.Bytes()
return command, nil
}
func CreateEchoCommand(data []byte) (*CommandMessage, error) { func CreateEchoCommand(data []byte) (*CommandMessage, error) {
command := &CommandMessage{ command := &CommandMessage{
CommandType: CommandTypeEcho, CommandType: CommandTypeEcho,

View File

@ -39,6 +39,10 @@ type (
Signature []byte Signature []byte
} }
SignDataEcdsaResponse struct {
Signature []byte
}
GetPubKeyResponse struct { GetPubKeyResponse struct {
Algorithm Algorithm Algorithm Algorithm
// KeyData can contain different formats depending on the algorithm according to the YubiHSM2 documentation. // KeyData can contain different formats depending on the algorithm according to the YubiHSM2 documentation.
@ -82,12 +86,16 @@ func ParseResponse(data []byte) (Response, error) {
return parseCreateAsymmetricKeyResponse(payload) return parseCreateAsymmetricKeyResponse(payload)
case CommandTypeSignDataEddsa: case CommandTypeSignDataEddsa:
return parseSignDataEddsaResponse(payload) return parseSignDataEddsaResponse(payload)
case CommandTypeSignDataEcdsa:
return parseSignDataEcdsaResponse(payload)
case CommandTypePutAsymmetric: case CommandTypePutAsymmetric:
return parsePutAsymmetricKeyResponse(payload) return parsePutAsymmetricKeyResponse(payload)
case CommandTypeCloseSession: case CommandTypeCloseSession:
return nil, nil return nil, nil
case CommandTypeGetPubKey: case CommandTypeGetPubKey:
return parseGetPubKeyResponse(payload) return parseGetPubKeyResponse(payload)
case CommandTypeDeleteObject:
return nil, nil
case CommandTypeEcho: case CommandTypeEcho:
return parseEchoResponse(payload) return parseEchoResponse(payload)
case ErrorResponseCode: case ErrorResponseCode:
@ -149,6 +157,12 @@ func parseSignDataEddsaResponse(payload []byte) (Response, error) {
}, nil }, nil
} }
func parseSignDataEcdsaResponse(payload []byte) (Response, error) {
return &SignDataEcdsaResponse{
Signature: payload,
}, nil
}
func parsePutAsymmetricKeyResponse(payload []byte) (Response, error) { func parsePutAsymmetricKeyResponse(payload []byte) (Response, error) {
if len(payload) != 2 { if len(payload) != 2 {
return nil, errors.New("invalid response payload length") return nil, errors.New("invalid response payload length")

View File

@ -78,7 +78,8 @@ const (
ErrorCodeCommandUnexecuted ErrorCode = 0xff ErrorCodeCommandUnexecuted ErrorCode = 0xff
// Algorithms // Algorithms
AlgorighmED25519 Algorithm = 46 AlgorithmSecp256k1 Algorithm = 15
AlgorighmED25519 Algorithm = 46
// Capabilities // Capabilities
CapabilityGetOpaque uint64 = 0x0000000000000001 CapabilityGetOpaque uint64 = 0x0000000000000001
@ -145,4 +146,13 @@ const (
Domain14 uint16 = 0x2000 Domain14 uint16 = 0x2000
Domain15 uint16 = 0x4000 Domain15 uint16 = 0x4000
Domain16 uint16 = 0x8000 Domain16 uint16 = 0x8000
// object types
ObjectTypeOpaque uint8 = 0x01
ObjectTypeAuthenticationKey uint8 = 0x02
ObjectTypeAsymmetricKey uint8 = 0x03
ObjectTypeWrapKey uint8 = 0x04
ObjectTypeHmacKey uint8 = 0x05
ObjectTypeTemplate uint8 = 0x06
ObjectTypeOtpAeadKey uint8 = 0x07
) )

View File

@ -1,6 +1,6 @@
package connector package connector
import "github.com/certusone/yubihsm-go/commands" import "github.com/loomnetwork/yubihsm-go/commands"
type ( type (
// Connector implements a simple request interface with a YubiHSM2 // Connector implements a simple request interface with a YubiHSM2

View File

@ -3,10 +3,11 @@ package connector
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/certusone/yubihsm-go/commands"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"strings" "strings"
"github.com/loomnetwork/yubihsm-go/commands"
) )
type ( type (

View File

@ -3,11 +3,12 @@ package yubihsm
import ( import (
"bytes" "bytes"
"errors" "errors"
"github.com/certusone/yubihsm-go/commands"
"github.com/certusone/yubihsm-go/connector"
"github.com/certusone/yubihsm-go/securechannel"
"sync" "sync"
"time" "time"
"github.com/loomnetwork/yubihsm-go/commands"
"github.com/loomnetwork/yubihsm-go/connector"
"github.com/loomnetwork/yubihsm-go/securechannel"
) )
type ( type (

View File

@ -7,10 +7,11 @@ import (
"crypto/rand" "crypto/rand"
"encoding/binary" "encoding/binary"
"errors" "errors"
"github.com/certusone/yubihsm-go/commands"
"github.com/certusone/yubihsm-go/connector"
"github.com/enceve/crypto/cmac"
"sync" "sync"
"github.com/enceve/crypto/cmac"
"github.com/loomnetwork/yubihsm-go/commands"
"github.com/loomnetwork/yubihsm-go/connector"
) )
type ( type (