Ox: Improve private key import.

CHANGELOG.md

@@ -7,6 +7,7 @@
 ### Changed
 - Ox: Improve rpad generation.
 - Reworked receiving of stanzas.
+- Ox: Improved private key import.
 
 ## [v0.4.0] 2022-04-30
 ### Added

ox.go

@@ -156,7 +156,14 @@ func oxImportPrivKey(jid string, privKeyLocation string, client *xmpp.Client,
 	if err != nil {
 		key, err = crypto.NewKeyFromArmored(buffer.String())
 		if err != nil {
-			return err
+			keyDecoded, err := base64.StdEncoding.DecodeString(buffer.String())
+			if err != nil {
+				return err
+			}
+			key, err = crypto.NewKey(keyDecoded)
+			if err != nil {
+				return err
+			}
 		}
 	}
 	entity := key.GetEntity()
@@ -174,7 +181,10 @@ func oxImportPrivKey(jid string, privKeyLocation string, client *xmpp.Client,
 	fingerprint := strings.ToUpper(pubKey.GetFingerprint())
 	_, err = oxRecvPublicKeys(client, iqc, jid, fingerprint)
 	if err != nil {
-		return errors.New("Key not found in pubsub: " + fingerprint)
+		err = oxPublishPubKey(jid, client, iqc, pubKey)
+		if err != nil {
+			return err
+		}
 	}
 	location, err := oxGetPrivKeyLoc(jid)
 	if err != nil {