fix property getter/setter

microsoft · Mar 16, 2022 · a5be7e4 · a5be7e4
1 parent 61856d0
commit a5be7e4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/cng/aes.go b/cng/aes.go
@@ -47,7 +47,7 @@ func loadAes(id string, mode string) (h aesAlgorithm, err error) {
 	}
 	var info bcrypt.KEY_LENGTHS_STRUCT
 	var discard uint32
-	err = bcrypt.GetProperty(bcrypt.HANDLE(h.h), utf16PtrFromString(bcrypt.KEY_LENGTHS), uintptr(unsafe.Pointer(&info)), uint32(unsafe.Sizeof(info)), &discard, 0)
+	err = bcrypt.GetProperty(bcrypt.HANDLE(h.h), utf16PtrFromString(bcrypt.KEY_LENGTHS), unsafe.Pointer(&info), uint32(unsafe.Sizeof(info)), &discard, 0)
 	if err != nil {
 		return
 	}

diff --git a/cng/cng.go b/cng/cng.go
@@ -27,11 +27,11 @@ func utf16PtrFromString(s string) *uint16 {
 }
 
 func setString(h bcrypt.HANDLE, name, val string) error {
-	return bcrypt.SetProperty(h, utf16PtrFromString(name), uintptr(unsafe.Pointer(utf16PtrFromString(val))), uint32(len(val))+1, 0)
+	return bcrypt.SetProperty(h, utf16PtrFromString(name), unsafe.Pointer(utf16PtrFromString(val)), uint32(len(val))+1, 0)
 }
 
 func getUint32(h bcrypt.HANDLE, name string) (uint32, error) {
 	var prop, discard uint32
-	err := bcrypt.GetProperty(h, utf16PtrFromString(name), uintptr(unsafe.Pointer(&prop)), 4, &discard, 0)
+	err := bcrypt.GetProperty(h, utf16PtrFromString(name), unsafe.Pointer(&prop), 4, &discard, 0)
 	return prop, err
 }
diff --git a/internal/bcrypt/bcrypt_windows.go b/internal/bcrypt/bcrypt_windows.go
@@ -88,8 +88,8 @@ func NewAUTHENTICATED_CIPHER_MODE_INFO(nonce, additionalData, tag []byte) *AUTHE
 	return &info
 }
 
-//sys	GetProperty(hObject HANDLE, pszProperty *uint16, pbOutput uintptr, cbOutput uint32, pcbResult *uint32, dwFlags uint32) (s error) = bcrypt.BCryptGetProperty
-//sys	SetProperty(hObject HANDLE, pszProperty *uint16, pbInput uintptr, cbInput uint32, dwFlags uint32) (s error) = bcrypt.BCryptSetProperty
+//sys	GetProperty(hObject HANDLE, pszProperty *uint16, pbOutput unsafe.Pointer, cbOutput uint32, pcbResult *uint32, dwFlags uint32) (s error) = bcrypt.BCryptGetProperty
+//sys	SetProperty(hObject HANDLE, pszProperty *uint16, pbInput unsafe.Pointer, cbInput uint32, dwFlags uint32) (s error) = bcrypt.BCryptSetProperty
 //sys	OpenAlgorithmProvider(phAlgorithm *ALG_HANDLE, pszAlgId *uint16, pszImplementation *uint16, dwFlags AlgorithmProviderFlags) (s error) = bcrypt.BCryptOpenAlgorithmProvider
 //sys	CloseAlgorithmProvider(hAlgorithm ALG_HANDLE, dwFlags uint32) (s error) = bcrypt.BCryptCloseAlgorithmProvider
 

diff --git a/internal/bcrypt/zsyscall_windows.go b/internal/bcrypt/zsyscall_windows.go