Move internal packages to internal directory

This commit is contained in:
DataHoarder 2024-05-01 11:36:43 +02:00
parent 3f70ec75be
commit 25b7fc4cc0
Signed by: DataHoarder
SSH key fingerprint: SHA256:OLTRf6Fl87G52SiR7sWLGNzlJt4WOX+tfI2yxo0z7xk
32 changed files with 19 additions and 18 deletions

View file

@ -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))

View file

@ -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.

View file

@ -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"
)

View file

@ -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"
)

View file

@ -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"
)

View file

@ -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) {

View file

@ -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) {

View file

@ -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"
)
/*

View file

@ -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"
)

View file

@ -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 {

2
vm.go
View file

@ -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"

View file

@ -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"
)

View file

@ -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"