mirror of
https://github.com/sonr-io/sonr.git
synced 2026-08-02 17:31:39 +00:00
fix: Refactor crypto
This commit is contained in:
Prad N
@@ -1,22 +0,0 @@
|
||||
//
|
||||
// Copyright Coinbase, Inc. All Rights Reserved.
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
//
|
||||
|
||||
package internal
|
||||
|
||||
import "fmt"
|
||||
|
||||
var (
|
||||
ErrNotOnCurve = fmt.Errorf("point not on the curve")
|
||||
ErrPointsDistinctCurves = fmt.Errorf("points must be from the same curve")
|
||||
ErrZmMembership = fmt.Errorf("x ∉ Z_m")
|
||||
ErrResidueOne = fmt.Errorf("value must be 1 (mod N)")
|
||||
ErrNCannotBeZero = fmt.Errorf("N cannot be 0")
|
||||
ErrNilArguments = fmt.Errorf("arguments cannot be nil")
|
||||
ErrZeroValue = fmt.Errorf("arguments cannot be 0")
|
||||
ErrInvalidRound = fmt.Errorf("invalid round method called")
|
||||
ErrIncorrectCount = fmt.Errorf("incorrect number of inputs")
|
||||
ErrInvalidJson = fmt.Errorf("json format does not contain the necessary data")
|
||||
)
|
||||
@@ -1,93 +0,0 @@
|
||||
//
|
||||
// Copyright Coinbase, Inc. All Rights Reserved.
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
//
|
||||
|
||||
package internal
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"crypto/sha256"
|
||||
"fmt"
|
||||
|
||||
"golang.org/x/crypto/hkdf"
|
||||
)
|
||||
|
||||
// Hash computes the HKDF over many values
|
||||
// iteratively such that each value is hashed separately
|
||||
// and based on preceding values
|
||||
//
|
||||
// The first value is computed as okm_0 = KDF(f || value) where
|
||||
// f is a byte slice of 32 0xFF
|
||||
// salt is zero-filled byte slice with length equal to the hash output length
|
||||
// info is the protocol name
|
||||
// okm is the 32 byte output
|
||||
//
|
||||
// The each subsequent iteration is computed by as okm_i = KDF(f_i || value || okm_{i-1})
|
||||
// where f_i = 2^b - 1 - i such that there are 0xFF bytes prior to the value.
|
||||
// f_1 changes the first byte to 0xFE, f_2 to 0xFD. The previous okm is appended to the value
|
||||
// to provide cryptographic domain separation.
|
||||
// See https://signal.org/docs/specifications/x3dh/#cryptographic-notation
|
||||
// and https://signal.org/docs/specifications/xeddsa/#hash-functions
|
||||
// for more details.
|
||||
// This uses the KDF function similar to X3DH for each `value`
|
||||
// But changes the key just like XEdDSA where the prefix bytes change by a single bit
|
||||
func Hash(info []byte, values ...[]byte) ([]byte, error) {
|
||||
// Don't accept any nil arguments
|
||||
if anyNil(values...) {
|
||||
return nil, ErrNilArguments
|
||||
}
|
||||
|
||||
salt := make([]byte, 32)
|
||||
okm := make([]byte, 32)
|
||||
f := bytes.Repeat([]byte{0xFF}, 32)
|
||||
|
||||
for _, b := range values {
|
||||
ikm := append(f, b...)
|
||||
ikm = append(ikm, okm...)
|
||||
kdf := hkdf.New(sha256.New, ikm, salt, info)
|
||||
n, err := kdf.Read(okm)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if n != len(okm) {
|
||||
return nil, fmt.Errorf("unable to read expected number of bytes want=%v got=%v", len(okm), n)
|
||||
}
|
||||
ByteSub(f)
|
||||
}
|
||||
return okm, nil
|
||||
}
|
||||
|
||||
func anyNil(values ...[]byte) bool {
|
||||
for _, x := range values {
|
||||
if x == nil {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// ByteSub is a constant time algorithm for subtracting
|
||||
// 1 from the array as if it were a big number.
|
||||
// 0 is considered a wrap which resets to 0xFF
|
||||
func ByteSub(b []byte) {
|
||||
m := byte(1)
|
||||
for i := 0; i < len(b); i++ {
|
||||
b[i] -= m
|
||||
|
||||
// If b[i] > 0, s == 0
|
||||
// If b[i] == 0, s == 1
|
||||
// Computing IsNonZero(b[i])
|
||||
s1 := int8(b[i]) >> 7
|
||||
s2 := -int8(b[i]) >> 7
|
||||
s := byte((s1 | s2) + 1)
|
||||
|
||||
// If s == 0, don't subtract anymore
|
||||
// s == 1, continue subtracting
|
||||
m = s & m
|
||||
// If s == 0 this does nothing
|
||||
// If s == 1 reset this value to 0xFF
|
||||
b[i] |= -s
|
||||
}
|
||||
}
|
||||
@@ -1,62 +0,0 @@
|
||||
//
|
||||
// Copyright Coinbase, Inc. All Rights Reserved.
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
//
|
||||
|
||||
package internal
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestByteSub(t *testing.T) {
|
||||
f := bytes.Repeat([]byte{0xFF}, 32)
|
||||
ByteSub(f)
|
||||
require.Equal(t, f[0], byte(0xFE))
|
||||
for i := 1; i < len(f); i++ {
|
||||
require.Equal(t, f[i], byte(0xFF))
|
||||
}
|
||||
ByteSub(f)
|
||||
require.Equal(t, f[0], byte(0xFD))
|
||||
for i := 1; i < len(f); i++ {
|
||||
require.Equal(t, f[i], byte(0xFF))
|
||||
}
|
||||
f[0] = 0x2
|
||||
ByteSub(f)
|
||||
for i := 1; i < len(f); i++ {
|
||||
require.Equal(t, f[i], byte(0xFF))
|
||||
}
|
||||
ByteSub(f)
|
||||
require.Equal(t, f[0], byte(0xFF))
|
||||
require.Equal(t, f[1], byte(0xFE))
|
||||
for i := 2; i < len(f); i++ {
|
||||
require.Equal(t, f[i], byte(0xFF))
|
||||
}
|
||||
ByteSub(f)
|
||||
require.Equal(t, f[0], byte(0xFE))
|
||||
require.Equal(t, f[1], byte(0xFE))
|
||||
for i := 2; i < len(f); i++ {
|
||||
require.Equal(t, f[i], byte(0xFF))
|
||||
}
|
||||
f[0] = 1
|
||||
f[1] = 1
|
||||
ByteSub(f)
|
||||
require.Equal(t, f[0], byte(0xFF))
|
||||
require.Equal(t, f[1], byte(0xFF))
|
||||
require.Equal(t, f[2], byte(0xFE))
|
||||
for i := 3; i < len(f); i++ {
|
||||
require.Equal(t, f[i], byte(0xFF))
|
||||
}
|
||||
}
|
||||
|
||||
func TestByteSubAll1(t *testing.T) {
|
||||
f := bytes.Repeat([]byte{0x1}, 32)
|
||||
ByteSub(f)
|
||||
for i := 0; i < len(f); i++ {
|
||||
require.Equal(t, f[i], byte(0xFF))
|
||||
}
|
||||
}
|
||||
@@ -1,44 +0,0 @@
|
||||
//
|
||||
// Copyright Coinbase, Inc. All Rights Reserved.
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
//
|
||||
|
||||
package internal
|
||||
|
||||
import (
|
||||
"crypto/elliptic"
|
||||
"math/big"
|
||||
|
||||
"filippo.io/edwards25519"
|
||||
)
|
||||
|
||||
func CalcFieldSize(curve elliptic.Curve) int {
|
||||
bits := curve.Params().BitSize
|
||||
return (bits + 7) / 8
|
||||
}
|
||||
|
||||
func ReverseScalarBytes(inBytes []byte) []byte {
|
||||
outBytes := make([]byte, len(inBytes))
|
||||
|
||||
for i, j := 0, len(inBytes)-1; j >= 0; i, j = i+1, j-1 {
|
||||
outBytes[i] = inBytes[j]
|
||||
}
|
||||
|
||||
return outBytes
|
||||
}
|
||||
|
||||
func BigInt2Ed25519Point(y *big.Int) (*edwards25519.Point, error) {
|
||||
b := y.Bytes()
|
||||
var arr [32]byte
|
||||
copy(arr[32-len(b):], b)
|
||||
return edwards25519.NewIdentityPoint().SetBytes(arr[:])
|
||||
}
|
||||
|
||||
func BigInt2Ed25519Scalar(x *big.Int) (*edwards25519.Scalar, error) {
|
||||
// big.Int is big endian; ed25519 assumes little endian encoding
|
||||
kBytes := ReverseScalarBytes(x.Bytes())
|
||||
var arr [32]byte
|
||||
copy(arr[:], kBytes)
|
||||
return edwards25519.NewScalar().SetCanonicalBytes(arr[:])
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
//
|
||||
// Copyright Coinbase, Inc. All Rights Reserved.
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
//
|
||||
|
||||
package internal
|
||||
|
||||
import (
|
||||
"math/big"
|
||||
)
|
||||
|
||||
// B10 creating a big.Int from a base 10 string. panics on failure to
|
||||
// ensure zero-values aren't used in place of malformed strings.
|
||||
func B10(s string) *big.Int {
|
||||
x, ok := new(big.Int).SetString(s, 10)
|
||||
if !ok {
|
||||
panic("Couldn't derive big.Int from string")
|
||||
}
|
||||
return x
|
||||
}
|
||||
Reference in New Issue
Block a user