From fd93c1873422a274f1e42410db1d2e2e4bbaafc0 Mon Sep 17 00:00:00 2001
From: joshemb <josh@elixxir.io>
Date: Thu, 18 Aug 2022 15:57:29 -0700
Subject: [PATCH] Refactor ReceptionIdentity.GetRSAPrivatePem to
ReceptionIdentity.GetRSAPrivateKey
---
connect/authenticated.go | 2 +-
ud/addFact.go | 2 +-
ud/register.go | 2 +-
ud/remove.go | 4 ++--
xxdk/e2e.go | 6 +++---
xxdk/identity.go | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/connect/authenticated.go b/connect/authenticated.go
index 6a311978d..c45489fbc 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 719e7d137..2022b82e0 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 495d50da5..48074cf1a 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 ebb809c00..691d9792f 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 4c2b9e22c..cd0d7f00c 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 9d646785f..1b2dd605d 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)
}
--
GitLab