v0.0.49

cryptext/passHash.go

@@ -150,9 +150,9 @@ func (ph PassHash) Verify(plainpass string, totp *string) bool {
 
 	if version == 4 {
 		if !hastotp {
-			return bcrypt.CompareHashAndPassword(payload, []byte(plainpass)) != nil
+			return bcrypt.CompareHashAndPassword(payload, []byte(plainpass)) == nil
 		} else {
-			return bcrypt.CompareHashAndPassword(payload, []byte(plainpass)) != nil && totpext.Validate(totpsecret, *totp)
+			return bcrypt.CompareHashAndPassword(payload, []byte(plainpass)) == nil && totpext.Validate(totpsecret, *totp)
 		}
 	}
 

sq/scanner.go

@@ -50,7 +50,6 @@ func ScanSingle[TData any](rows *sqlx.Rows, mode StructScanMode, sec StructScanS
 				return *new(TData), err
 			}
 		} else if mode == SModeExtended {
-			var data TData
 			err := strscan.StructScanExt(&data)
 			if err != nil {
 				return *new(TData), err

sq/structscanner.go

@@ -113,7 +113,7 @@ func (r *StructScanner) StructScanExt(dest any) error {
 
 				if _, ok := forcenulled[k]; !ok {
 					f := reflectx.FieldByIndexes(v, traversal[0:i])
-					f.Set(reflect.New(f.Type().Elem())) // set to nil
+					f.Set(reflect.Zero(f.Type())) // set to nil
 					forcenulled[k] = true
 				}
 
@@ -138,7 +138,7 @@ func (r *StructScanner) StructScanExt(dest any) error {
 				return errors.New(fmt.Sprintf("Cannot set field %v to NULL value from column '%s' (type: %s)", traversal, r.columns[i], f.Type().String()))
 			}
 
-			f.Set(reflect.New(f.Type().Elem())) // set to nil
+			f.Set(reflect.Zero(f.Type())) // set to nil
 		} else {
 			f.Set(val3)
 		}