diff --git a/connect/authenticated.go b/connect/authenticated.go index 6a311978d78333ec9709151e7528c7da7f55657f..c45489fbc78ab87ab1115ab6da02d2b0fe5167f4 100644 --- a/connect/authenticated.go +++ b/connect/authenticated.go @@ -67,7 +67,7 @@ func ConnectWithAuthentication(recipient contact.Contact, user *xxdk.E2e, // Build the authenticated connection and return identity := user.GetReceptionIdentity() - privKey, err := identity.GetRSAPrivatePem() + privKey, err := identity.GetRSAPrivateKey() if err != nil { return nil, err } diff --git a/ud/addFact.go b/ud/addFact.go index 719e7d137ab1f9c3e5ce4d414c9db08876d668a4..2022b82e03482dbbe5d172ff6fc95a533c1d87d2 100644 --- a/ud/addFact.go +++ b/ud/addFact.go @@ -40,7 +40,7 @@ func (m *Manager) addFact(inFact fact.Fact, myId *id.ID, fHash := factID.Fingerprint(f) // Sign our inFact for putting into the request - privKey, err := m.user.GetReceptionIdentity().GetRSAPrivatePem() + privKey, err := m.user.GetReceptionIdentity().GetRSAPrivateKey() if err != nil { return "", err } diff --git a/ud/register.go b/ud/register.go index 495d50da5e1fb51dd0e9d0e9d0211547d3314946..48074cf1ac491fb5496d1160d1ef7cda54138edb 100644 --- a/ud/register.go +++ b/ud/register.go @@ -19,7 +19,7 @@ func (m *Manager) register(username string, networkSignature []byte, // Retrieve data used for registration identity := m.user.GetReceptionIdentity() - privKey, err := identity.GetRSAPrivatePem() + privKey, err := identity.GetRSAPrivateKey() if err != nil { return err } diff --git a/ud/remove.go b/ud/remove.go index ebb809c0022ab0bbc81237c092c106bcbf946bd2..691d9792f4468093ed2468b654b829ec60353c35 100644 --- a/ud/remove.go +++ b/ud/remove.go @@ -40,7 +40,7 @@ func (m *Manager) removeFact(f fact.Fact, // Sign our inFact for putting into the request identity := m.user.GetReceptionIdentity() - privKey, err := identity.GetRSAPrivatePem() + privKey, err := identity.GetRSAPrivateKey() if err != nil { return err } @@ -78,7 +78,7 @@ func (m *Manager) PermanentDeleteAccount(f fact.Fact) error { "a username. Cannot remove fact %q", f.Fact)) } identity := m.user.GetReceptionIdentity() - privKey, err := identity.GetRSAPrivatePem() + privKey, err := identity.GetRSAPrivateKey() if err != nil { return err } diff --git a/xxdk/e2e.go b/xxdk/e2e.go index 4c2b9e22ca2e800e77489f69690092e13f6db6bc..cd0d7f00c2931b192d20ba6206e4b21067e6740f 100644 --- a/xxdk/e2e.go +++ b/xxdk/e2e.go @@ -102,7 +102,7 @@ func loginLegacy(net *Cmix, callbacks AuthCallbacks, return nil, err } - rsaKey, err := identity.GetRSAPrivatePem() + rsaKey, err := identity.GetRSAPrivateKey() if err != nil { return nil, err } @@ -116,7 +116,7 @@ func login(net *Cmix, callbacks AuthCallbacks, identity ReceptionIdentity, kv *versioned.KV, params E2EParams) (m *E2e, err error) { // Verify the passed-in ReceptionIdentity matches its properties - privatePem, err := identity.GetRSAPrivatePem() + privatePem, err := identity.GetRSAPrivateKey() if err != nil { return nil, err } @@ -246,7 +246,7 @@ func (m *E2e) ConstructProtoUserFile() ([]byte, error) { transIdentity := m.Cmix.GetTransmissionIdentity() receptionIdentity := m.GetReceptionIdentity() - privatePem, err := receptionIdentity.GetRSAPrivatePem() + privatePem, err := receptionIdentity.GetRSAPrivateKey() if err != nil { return nil, err } diff --git a/xxdk/identity.go b/xxdk/identity.go index 9d646785fd71c713398036fd4dc8ae66ecbbc447..1b2dd605dfa9f6bd63daeff49967dcdcd9fb459e 100644 --- a/xxdk/identity.go +++ b/xxdk/identity.go @@ -80,8 +80,8 @@ func (r ReceptionIdentity) GetDHKeyPrivate() (*cyclic.Int, error) { return dhKeyPriv, err } -// GetRSAPrivatePem returns the RSAPrivatePem. -func (r ReceptionIdentity) GetRSAPrivatePem() (*rsa.PrivateKey, error) { +// GetRSAPrivateKey returns the RSAPrivatePem. +func (r ReceptionIdentity) GetRSAPrivateKey() (*rsa.PrivateKey, error) { return rsa.LoadPrivateKeyFromPem(r.RSAPrivatePem) }