diff --git a/vendor/git.autistici.org/ai3/go-common/pwhash/argon2.go b/vendor/git.autistici.org/ai3/go-common/pwhash/argon2.go index 09294107d7cd972c0a087946144f464944128a5b..fef03caa0c001faace0d16123b23e53e5f0626ec 100644 --- a/vendor/git.autistici.org/ai3/go-common/pwhash/argon2.go +++ b/vendor/git.autistici.org/ai3/go-common/pwhash/argon2.go @@ -6,6 +6,7 @@ import ( "encoding/hex" "errors" "fmt" + "log" "strconv" "strings" @@ -54,6 +55,16 @@ func NewArgon2WithParams(time, mem uint32, threads uint8) PasswordHash { return newArgon2PasswordHash(time, mem, threads, &a2Codec{}) } +// NewArgon2Std returns an Argon2i-based PasswordHash that conforms +// to the reference implementation encoding, using default parameters. +func NewArgon2Std() PasswordHash { + return NewArgon2StdWithParams( + defaultArgon2Params.Time, + defaultArgon2Params.Memory, + defaultArgon2Params.Threads, + ) +} + // NewArgon2StdWithParams returns an Argon2i-based PasswordHash using // the specified parameters for time, memory, and number of // threads. This will use the string encoding ("$argon2$") documented @@ -204,5 +215,7 @@ func (*argon2StdCodec) decodeArgon2Hash(s string) (params argon2Params, salt []b return } dk, err = base64.RawStdEncoding.DecodeString(parts[3]) + + log.Printf("params: %+v", params) return } diff --git a/vendor/git.autistici.org/ai3/go-common/pwhash/password.go b/vendor/git.autistici.org/ai3/go-common/pwhash/password.go index 86412954153eed8b988c59d01fb3a19e1b9e071a..07b093d412991e5bb07f78e9e400b94aad6ae60a 100644 --- a/vendor/git.autistici.org/ai3/go-common/pwhash/password.go +++ b/vendor/git.autistici.org/ai3/go-common/pwhash/password.go @@ -49,11 +49,12 @@ func getRandomBytes(n int) []byte { // A registry of default handlers for decoding passwords. var prefixRegistry = map[string]PasswordHash{ - "$1$": NewSystemCrypt(), - "$5$": NewSystemCrypt(), - "$6$": NewSystemCrypt(), - "$s$": NewScrypt(), - "$a2$": NewArgon2(), + "$1$": NewSystemCrypt(), + "$5$": NewSystemCrypt(), + "$6$": NewSystemCrypt(), + "$s$": NewScrypt(), + "$a2$": NewArgon2(), + "$argon2i$": NewArgon2Std(), } // ComparePassword returns true if the given password matches the diff --git a/vendor/vendor.json b/vendor/vendor.json index 0d8dd8bfc1088e563d7ab974946f0bf132e7e251..f1b3f5a386d4abf8c54c6be396df2b07c3818ad8 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -11,44 +11,44 @@ { "checksumSHA1": "gQae1gsfGat/VmlQHY9TaiiZGZk=", "path": "git.autistici.org/ai3/go-common", - "revision": "3e5c304bf9d132bc389e7d168d93dcf1c43c7265", - "revisionTime": "2020-08-23T15:18:38Z" + "revision": "b151964cbeb8f4474c973585417649ee14e4b0c4", + "revisionTime": "2020-08-23T17:45:36Z" }, { "checksumSHA1": "PrVrwtr3weyGRa2j+SIYEMjtuvU=", "path": "git.autistici.org/ai3/go-common/clientutil", - "revision": "3e5c304bf9d132bc389e7d168d93dcf1c43c7265", - "revisionTime": "2020-08-23T15:18:38Z" + "revision": "b151964cbeb8f4474c973585417649ee14e4b0c4", + "revisionTime": "2020-08-23T17:45:36Z" }, { "checksumSHA1": "71XnADFH0zmU4hW8deQffXpbDMQ=", "path": "git.autistici.org/ai3/go-common/ldap", - "revision": "3e5c304bf9d132bc389e7d168d93dcf1c43c7265", - "revisionTime": "2020-08-23T15:18:38Z" + "revision": "b151964cbeb8f4474c973585417649ee14e4b0c4", + "revisionTime": "2020-08-23T17:45:36Z" }, { "checksumSHA1": "ETt1H7ZXeT+mOGVuWDvgGBVx98k=", "path": "git.autistici.org/ai3/go-common/ldap/compositetypes", - "revision": "3e5c304bf9d132bc389e7d168d93dcf1c43c7265", - "revisionTime": "2020-08-23T15:18:38Z" + "revision": "b151964cbeb8f4474c973585417649ee14e4b0c4", + "revisionTime": "2020-08-23T17:45:36Z" }, { - "checksumSHA1": "TswnetMKZo4KCydKOkzoGrTMwmA=", + "checksumSHA1": "J011m4Yuj/ujUozVyMUCAdEk2fI=", "path": "git.autistici.org/ai3/go-common/pwhash", - "revision": "3e5c304bf9d132bc389e7d168d93dcf1c43c7265", - "revisionTime": "2020-08-23T15:18:38Z" + "revision": "b151964cbeb8f4474c973585417649ee14e4b0c4", + "revisionTime": "2020-08-23T17:45:36Z" }, { "checksumSHA1": "C510IXCxCms4yjWjIu1pbdqPwN4=", "path": "git.autistici.org/ai3/go-common/tracing", - "revision": "3e5c304bf9d132bc389e7d168d93dcf1c43c7265", - "revisionTime": "2020-08-23T15:18:38Z" + "revision": "b151964cbeb8f4474c973585417649ee14e4b0c4", + "revisionTime": "2020-08-23T17:45:36Z" }, { "checksumSHA1": "jRc0JfRUtCr3xxkgwRDVppsSnl0=", "path": "git.autistici.org/ai3/go-common/unix", - "revision": "3e5c304bf9d132bc389e7d168d93dcf1c43c7265", - "revisionTime": "2020-08-23T15:18:38Z" + "revision": "b151964cbeb8f4474c973585417649ee14e4b0c4", + "revisionTime": "2020-08-23T17:45:36Z" }, { "checksumSHA1": "J0QeD9LVccFOejgPKa0td8JD0rY=",