Small consistency fixes

pkg/libsignalgo/address.go

@@ -44,9 +44,9 @@ func NewAddress(name string, deviceID uint) (*Address, error) {
  return wrapAddress(pa), nil
 }
 
-func (pk *Address) Clone() (*Address, error) {
+func (pa *Address) Clone() (*Address, error) {
  var cloned *C.SignalProtocolAddress
- signalFfiError := C.signal_address_clone(&cloned, pk.ptr)
+ signalFfiError := C.signal_address_clone(&cloned, pa.ptr)
  if signalFfiError != nil {
  return nil, wrapError(signalFfiError)
  }

pkg/libsignalgo/authcredential.go

@@ -47,11 +47,11 @@ func ReceiveAuthCredentialWithPni(
 ) (*AuthCredentialWithPni, error) {
  c_result := [C.SignalAUTH_CREDENTIAL_WITH_PNI_LEN]C.uchar{}
  c_serverPublicParams := (*[C.SignalSERVER_PUBLIC_PARAMS_LEN]C.uchar)(unsafe.Pointer(&serverPublicParams[0]))
- c_aci, err := SignalServiceIdFromUUID(aci)
+ c_aci, err := SignalServiceIDFromUUID(aci)
  if err != nil {
  return nil, err
  }
- c_pni, err := SignalPNIServiceIdFromUUID(pni)
+ c_pni, err := SignalPNIServiceIDFromUUID(pni)
  if err != nil {
  return nil, err
  }

pkg/libsignalgo/fingerprint.go

@@ -81,7 +81,7 @@ func (f *Fingerprint) DisplayString() (string, error) {
  return CopyCStringToString(displayString), nil
 }
 
-func (k *Fingerprint) Compare(fingerprint1, fingerprint2 []byte) (bool, error) {
+func (f *Fingerprint) Compare(fingerprint1, fingerprint2 []byte) (bool, error) {
  var compare C.bool
  signalFfiError := C.signal_fingerprint_compare(&compare, BytesToBuffer(fingerprint1), BytesToBuffer(fingerprint2))
  if signalFfiError != nil {

pkg/libsignalgo/groupsecretparams.go

@@ -121,7 +121,7 @@ func (gsp *GroupSecretParams) DecryptUUID(ciphertextUUID UUIDCiphertext) (*uuid.
  return nil, wrapError(signalFfiError)
  }
 
- result, err := SignalServiceIdToUUID(&u)
+ result, err := SignalServiceIDToUUID(&u)
  if err != nil {
  return nil, err
  }
@@ -130,7 +130,7 @@ func (gsp *GroupSecretParams) DecryptUUID(ciphertextUUID UUIDCiphertext) (*uuid.
 
 func (gsp *GroupSecretParams) DecryptProfileKey(ciphertextProfileKey ProfileKeyCiphertext, u uuid.UUID) (*ProfileKey, error) {
  profileKey := [C.SignalPROFILE_KEY_LEN]C.uchar{}
- serviceId, err := SignalServiceIdFromUUID(u)
+ serviceId, err := SignalServiceIDFromUUID(u)
  if err != nil {
  return nil, err
  }

pkg/libsignalgo/hsmenclave.go

@@ -70,9 +70,9 @@ func (hsm *HSMEnclaveClient) EstablishedSend(plaintext []byte) ([]byte, error) {
  return CopySignalOwnedBufferToBytes(resp), nil
 }
 
-func (cds *HSMEnclaveClient) EstablishedReceive(ciphertext []byte) ([]byte, error) {
+func (hsm *HSMEnclaveClient) EstablishedReceive(ciphertext []byte) ([]byte, error) {
  var resp C.SignalOwnedBuffer = C.SignalOwnedBuffer{}
- signalFfiError := C.signal_hsm_enclave_client_established_recv(&resp, cds.ptr, BytesToBuffer(ciphertext))
+ signalFfiError := C.signal_hsm_enclave_client_established_recv(&resp, hsm.ptr, BytesToBuffer(ciphertext))
  if signalFfiError != nil {
  return nil, wrapError(signalFfiError)
  }

pkg/libsignalgo/plaintextcontent.go

@@ -51,18 +51,18 @@ func DeserializePlaintextContent(plaintextContentBytes []byte) (*PlaintextConten
  return wrapPlaintextContent(pc), nil
 }
 
-func (pk *PlaintextContent) Clone() (*PlaintextContent, error) {
+func (pc *PlaintextContent) Clone() (*PlaintextContent, error) {
  var cloned *C.SignalPlaintextContent
- signalFfiError := C.signal_plaintext_content_clone(&cloned, pk.ptr)
+ signalFfiError := C.signal_plaintext_content_clone(&cloned, pc.ptr)
  if signalFfiError != nil {
  return nil, wrapError(signalFfiError)
  }
  return wrapPlaintextContent(cloned), nil
 }
 
-func (p *PlaintextContent) Destroy() error {
- runtime.SetFinalizer(p, nil)
- return wrapError(C.signal_plaintext_content_destroy(p.ptr))
+func (pc *PlaintextContent) Destroy() error {
+ runtime.SetFinalizer(pc, nil)
+ return wrapError(C.signal_plaintext_content_destroy(pc.ptr))
 }
 
 func (pc *PlaintextContent) Serialize() ([]byte, error) {

pkg/libsignalgo/profilekey.go

@@ -50,7 +50,7 @@ func (pk *ProfileKey) Slice() []byte {
 func (pk *ProfileKey) GetCommitment(u uuid.UUID) (*ProfileKeyCommitment, error) {
  c_result := [C.SignalPROFILE_KEY_COMMITMENT_LEN]C.uchar{}
  c_profileKey := (*[C.SignalPROFILE_KEY_LEN]C.uchar)(unsafe.Pointer(pk))
- c_uuid, err := SignalServiceIdFromUUID(u)
+ c_uuid, err := SignalServiceIDFromUUID(u)
  if err != nil {
  return nil, err
  }
@@ -73,7 +73,7 @@ func (pk *ProfileKey) GetCommitment(u uuid.UUID) (*ProfileKeyCommitment, error)
 func (pk *ProfileKey) GetProfileKeyVersion(u uuid.UUID) (*ProfileKeyVersion, error) {
  c_result := [C.SignalPROFILE_KEY_VERSION_ENCODED_LEN]C.uchar{}
  c_profileKey := (*[C.SignalPROFILE_KEY_LEN]C.uchar)(unsafe.Pointer(pk))
- c_uuid, err := SignalServiceIdFromUUID(u)
+ c_uuid, err := SignalServiceIDFromUUID(u)
  if err != nil {
  return nil, err
  }
@@ -111,14 +111,6 @@ func (pk *ProfileKey) DeriveAccessKey() (*AccessKey, error) {
  return &result, nil
 }
 
-func cBytes(b []byte) *C.uchar {
- return (*C.uchar)(unsafe.Pointer(&b[0]))
-}
-
-func cLen(b []byte) C.uint32_t {
- return C.uint32_t(len(b))
-}
-
 func randBytes(length int) []byte {
  buf := make([]byte, length)
  if n, err := rand.Read(buf); err != nil {
@@ -140,7 +132,7 @@ func CreateProfileKeyCredentialRequestContext(serverPublicParams ServerPublicPar
  random := [32]byte(randBytes(32))
  c_random := (*[32]C.uchar)(unsafe.Pointer(&random[0]))
  c_profileKey := (*[C.SignalPROFILE_KEY_LEN]C.uchar)(unsafe.Pointer(&profileKey[0]))
- c_uuid, err := SignalServiceIdFromUUID(u)
+ c_uuid, err := SignalServiceIDFromUUID(u)
  if err != nil {
  return nil, err
  }

pkg/libsignalgo/sendercertificate_test.go

@@ -96,7 +96,7 @@ func TestSenderCertificate_Operations(t *testing.T) {
  assert.NoError(t, err)
  assert.NotNil(t, serverCertificate)
 
- keyID, err := serverCertificate.GetKeyId()
+ keyID, err := serverCertificate.GetKeyID()
  assert.NoError(t, err)
  assert.Equal(t, uint32(1), keyID)
 

pkg/libsignalgo/servercertificate.go

@@ -94,7 +94,7 @@ func (sc *ServerCertificate) GetSignature() ([]byte, error) {
  return CopySignalOwnedBufferToBytes(signature), nil
 }
 
-func (sc *ServerCertificate) GetKeyId() (uint32, error) {
+func (sc *ServerCertificate) GetKeyID() (uint32, error) {
  var keyID C.uint32_t
  signalFfiError := C.signal_server_certificate_get_key_id(&keyID, sc.ptr)
  if signalFfiError != nil {

pkg/libsignalgo/serviceid.go

@@ -35,7 +35,7 @@ func init() {
  }
 }
 
-func SignalServiceIdFromUUID(uuid uuid.UUID) (cPNIType, error) {
+func SignalServiceIDFromUUID(uuid uuid.UUID) (cPNIType, error) {
  var result C.SignalServiceIdFixedWidthBinaryBytes
  signalFfiError := C.signal_service_id_parse_from_service_id_binary(&result, BytesToBuffer(uuid[:]))
  if signalFfiError != nil {
@@ -44,7 +44,7 @@ func SignalServiceIdFromUUID(uuid uuid.UUID) (cPNIType, error) {
  return cPNIType(unsafe.Pointer(&result)), nil
 }
 
-func SignalPNIServiceIdFromUUID(uuid uuid.UUID) (cPNIType, error) {
+func SignalPNIServiceIDFromUUID(uuid uuid.UUID) (cPNIType, error) {
  var result C.SignalServiceIdFixedWidthBinaryBytes
  // Prepend a 0x01 to the UUID to indicate that it is a PNI UUID
  pniUUID := append([]byte{0x01}, uuid[:]...)
@@ -55,7 +55,7 @@ func SignalPNIServiceIdFromUUID(uuid uuid.UUID) (cPNIType, error) {
  return cPNIType(unsafe.Pointer(&result)), nil
 }
 
-func SignalServiceIdToUUID(serviceId *C.SignalServiceIdFixedWidthBinaryBytes) (uuid.UUID, error) {
+func SignalServiceIDToUUID(serviceId *C.SignalServiceIdFixedWidthBinaryBytes) (uuid.UUID, error) {
  result := C.SignalOwnedBuffer{}
  serviceIdBytes := cPNIType(unsafe.Pointer(serviceId)) // Hack around gcc bug, not needed for clang
  signalFfiError := C.signal_service_id_service_id_binary(&result, serviceIdBytes)