diff --git a/cache.go b/cache.go index edff15a..d331017 100644 --- a/cache.go +++ b/cache.go @@ -1,9 +1,9 @@ package randomx import ( - "git.gammaspectra.live/P2Pool/go-randomx/v3/argon2" - "git.gammaspectra.live/P2Pool/go-randomx/v3/blake2" - "git.gammaspectra.live/P2Pool/go-randomx/v3/keys" + "git.gammaspectra.live/P2Pool/go-randomx/v3/internal/argon2" + "git.gammaspectra.live/P2Pool/go-randomx/v3/internal/blake2" + "git.gammaspectra.live/P2Pool/go-randomx/v3/internal/keys" "runtime" "slices" "unsafe" @@ -60,7 +60,7 @@ func (cache *Cache) Init(key []byte) { kkey := slices.Clone(key) - argonBlocks := argon2.BuildBlocks(kkey, []byte(RANDOMX_ARGON_SALT), []byte{}, []byte{}, RANDOMX_ARGON_ITERATIONS, RANDOMX_ARGON_MEMORY, RANDOMX_ARGON_LANES, 0) + argonBlocks := argon2.BuildBlocks(kkey, []byte(RANDOMX_ARGON_SALT), RANDOMX_ARGON_ITERATIONS, RANDOMX_ARGON_MEMORY, RANDOMX_ARGON_LANES) memoryBlocks := unsafe.Slice((*MemoryBlock)(unsafe.Pointer(unsafe.SliceData(argonBlocks))), int(unsafe.Sizeof(argon2.Block{}))/int(unsafe.Sizeof(MemoryBlock{}))*len(argonBlocks)) diff --git a/config.go b/config.go index c3cf041..09217e1 100644 --- a/config.go +++ b/config.go @@ -29,7 +29,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package randomx -import "git.gammaspectra.live/P2Pool/go-randomx/v3/argon2" +import "git.gammaspectra.live/P2Pool/go-randomx/v3/internal/argon2" // see reference configuration.h // Cache size in KiB. Must be a power of 2. diff --git a/aes/const.go b/internal/aes/const.go similarity index 100% rename from aes/const.go rename to internal/aes/const.go diff --git a/aes/hash.go b/internal/aes/hash.go similarity index 98% rename from aes/hash.go rename to internal/aes/hash.go index 0fdf40d..f088dee 100644 --- a/aes/hash.go +++ b/internal/aes/hash.go @@ -30,7 +30,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package aes import ( - "git.gammaspectra.live/P2Pool/go-randomx/v3/keys" + "git.gammaspectra.live/P2Pool/go-randomx/v3/internal/keys" "unsafe" ) diff --git a/aes/hash_amd64.go b/internal/aes/hash_amd64.go similarity index 90% rename from aes/hash_amd64.go rename to internal/aes/hash_amd64.go index b88a0e8..bd1e876 100644 --- a/aes/hash_amd64.go +++ b/internal/aes/hash_amd64.go @@ -3,8 +3,8 @@ package aes import ( - "git.gammaspectra.live/P2Pool/go-randomx/v3/asm" - "git.gammaspectra.live/P2Pool/go-randomx/v3/keys" + "git.gammaspectra.live/P2Pool/go-randomx/v3/internal/asm" + "git.gammaspectra.live/P2Pool/go-randomx/v3/internal/keys" "golang.org/x/sys/cpu" "unsafe" ) diff --git a/aes/hash_generic.go b/internal/aes/hash_generic.go similarity index 93% rename from aes/hash_generic.go rename to internal/aes/hash_generic.go index 6c76e3e..afaa48e 100644 --- a/aes/hash_generic.go +++ b/internal/aes/hash_generic.go @@ -3,7 +3,7 @@ package aes import ( - "git.gammaspectra.live/P2Pool/go-randomx/v3/keys" + "git.gammaspectra.live/P2Pool/go-randomx/v3/internal/keys" "unsafe" ) diff --git a/aes/round.go b/internal/aes/round.go similarity index 100% rename from aes/round.go rename to internal/aes/round.go diff --git a/aes/round_amd64.go b/internal/aes/round_amd64.go similarity index 93% rename from aes/round_amd64.go rename to internal/aes/round_amd64.go index cd1e5eb..d1bc2bd 100644 --- a/aes/round_amd64.go +++ b/internal/aes/round_amd64.go @@ -3,7 +3,7 @@ package aes import ( - "git.gammaspectra.live/P2Pool/go-randomx/v3/asm" + "git.gammaspectra.live/P2Pool/go-randomx/v3/internal/asm" ) func aesroundtrip_decenc(states *[4][4]uint32, keys *[4][4]uint32) { diff --git a/aes/round_generic.go b/internal/aes/round_generic.go similarity index 100% rename from aes/round_generic.go rename to internal/aes/round_generic.go diff --git a/argon2/argon2.go b/internal/argon2/argon2.go similarity index 85% rename from argon2/argon2.go rename to internal/argon2/argon2.go index bd962e4..f455f94 100644 --- a/argon2/argon2.go +++ b/internal/argon2/argon2.go @@ -23,7 +23,7 @@ func initBlocks(h0 *[blake2b.Size + 8]byte, memory, threads uint32) []Block func processBlocks(B []Block, time, memory, threads uint32, mode int) // BuildBlocks From golang.org/x/crypto/argon2.deriveKey without last deriveKey call -func BuildBlocks(password, salt, secret, data []byte, time, memory uint32, threads uint8, keyLen uint32) []Block { +func BuildBlocks(password, salt []byte, time, memory uint32, threads uint8) []Block { if time < 1 { panic("argon2: number of rounds too small") } @@ -31,7 +31,8 @@ func BuildBlocks(password, salt, secret, data []byte, time, memory uint32, threa panic("argon2: parallelism degree too low") } const mode = 0 /* argon2d */ - h0 := initHash(password, salt, secret, data, time, memory, uint32(threads), keyLen, mode) + const keyLen = 0 + h0 := initHash(password, salt, nil, nil, time, memory, uint32(threads), keyLen, mode) memory = memory / (syncPoints * uint32(threads)) * (syncPoints * uint32(threads)) if memory < 2*syncPoints*uint32(threads) { diff --git a/asm/aes_amd64.go b/internal/asm/aes_amd64.go similarity index 100% rename from asm/aes_amd64.go rename to internal/asm/aes_amd64.go diff --git a/asm/aes_amd64.s b/internal/asm/aes_amd64.s similarity index 100% rename from asm/aes_amd64.s rename to internal/asm/aes_amd64.s diff --git a/asm/aes_noasm.go b/internal/asm/aes_noasm.go similarity index 100% rename from asm/aes_noasm.go rename to internal/asm/aes_noasm.go diff --git a/asm/cpuid_amd64.go b/internal/asm/cpuid_amd64.go similarity index 100% rename from asm/cpuid_amd64.go rename to internal/asm/cpuid_amd64.go diff --git a/asm/cpuid_amd64.s b/internal/asm/cpuid_amd64.s similarity index 100% rename from asm/cpuid_amd64.s rename to internal/asm/cpuid_amd64.s diff --git a/asm/round.go b/internal/asm/round.go similarity index 100% rename from asm/round.go rename to internal/asm/round.go diff --git a/asm/round_386.go b/internal/asm/round_386.go similarity index 100% rename from asm/round_386.go rename to internal/asm/round_386.go diff --git a/asm/round_386.s b/internal/asm/round_386.s similarity index 100% rename from asm/round_386.s rename to internal/asm/round_386.s diff --git a/asm/round_amd64.go b/internal/asm/round_amd64.go similarity index 100% rename from asm/round_amd64.go rename to internal/asm/round_amd64.go diff --git a/asm/round_amd64.s b/internal/asm/round_amd64.s similarity index 100% rename from asm/round_amd64.s rename to internal/asm/round_amd64.s diff --git a/asm/round_arm64.go b/internal/asm/round_arm64.go similarity index 100% rename from asm/round_arm64.go rename to internal/asm/round_arm64.go diff --git a/asm/round_arm64.s b/internal/asm/round_arm64.s similarity index 100% rename from asm/round_arm64.s rename to internal/asm/round_arm64.s diff --git a/asm/round_noasm.go b/internal/asm/round_noasm.go similarity index 100% rename from asm/round_noasm.go rename to internal/asm/round_noasm.go diff --git a/blake2/generator.go b/internal/blake2/generator.go similarity index 100% rename from blake2/generator.go rename to internal/blake2/generator.go diff --git a/keys/keys.go b/internal/keys/keys.go similarity index 100% rename from keys/keys.go rename to internal/keys/keys.go diff --git a/keys/keys_test.go b/internal/keys/keys_test.go similarity index 100% rename from keys/keys_test.go rename to internal/keys/keys_test.go diff --git a/jit_amd64.go b/jit_amd64.go index 3ffdef0..d01b555 100644 --- a/jit_amd64.go +++ b/jit_amd64.go @@ -4,7 +4,7 @@ package randomx import ( "encoding/binary" - "git.gammaspectra.live/P2Pool/go-randomx/v3/asm" + "git.gammaspectra.live/P2Pool/go-randomx/v3/internal/asm" ) /* diff --git a/superscalar.go b/superscalar.go index 8cb5753..42acea0 100644 --- a/superscalar.go +++ b/superscalar.go @@ -30,7 +30,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package randomx import ( - "git.gammaspectra.live/P2Pool/go-randomx/v3/blake2" + "git.gammaspectra.live/P2Pool/go-randomx/v3/internal/blake2" "math/bits" ) diff --git a/superscalar_instruction.go b/superscalar_instruction.go index a5ffbb2..3c4b6ed 100644 --- a/superscalar_instruction.go +++ b/superscalar_instruction.go @@ -1,6 +1,6 @@ package randomx -import "git.gammaspectra.live/P2Pool/go-randomx/v3/blake2" +import "git.gammaspectra.live/P2Pool/go-randomx/v3/internal/blake2" // SuperScalarInstruction superscalar program is built with superscalar instructions type SuperScalarInstruction struct { diff --git a/vm.go b/vm.go index 90c274e..fed4f14 100644 --- a/vm.go +++ b/vm.go @@ -30,7 +30,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package randomx import ( - "git.gammaspectra.live/P2Pool/go-randomx/v3/aes" + "git.gammaspectra.live/P2Pool/go-randomx/v3/internal/aes" "math" "runtime" "unsafe" diff --git a/vm_bytecode_native.go b/vm_bytecode_native.go index d278758..6036993 100644 --- a/vm_bytecode_native.go +++ b/vm_bytecode_native.go @@ -3,7 +3,7 @@ package randomx import ( - "git.gammaspectra.live/P2Pool/go-randomx/v3/asm" + "git.gammaspectra.live/P2Pool/go-randomx/v3/internal/asm" "math" "math/bits" ) diff --git a/vm_instruction.go b/vm_instruction.go index dd8f380..698c41b 100644 --- a/vm_instruction.go +++ b/vm_instruction.go @@ -30,7 +30,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package randomx import ( - "git.gammaspectra.live/P2Pool/go-randomx/v3/aes" + "git.gammaspectra.live/P2Pool/go-randomx/v3/internal/aes" "unsafe" ) import "encoding/binary"