From 8ffd7aa1d4c3fe975b34973c4dc0cbc2a0a1a440 Mon Sep 17 00:00:00 2001
From: larabr <7375870+larabr@users.noreply.github.com>
Date: Tue, 21 Feb 2023 15:49:32 +0100
Subject: [PATCH] Remove import cycles

---
 src/crypto/cipher/getCipher.js         | 13 +++++++++++++
 src/crypto/crypto.js                   | 13 ++-----------
 src/crypto/mode/cfb.js                 |  9 +++++----
 src/crypto/public_key/elliptic/ecdh.js |  2 +-
 src/key/factory.js                     | 21 ++++++++++++++++++++-
 src/key/key.js                         | 20 --------------------
 6 files changed, 41 insertions(+), 37 deletions(-)
 create mode 100644 src/crypto/cipher/getCipher.js

diff --git a/src/crypto/cipher/getCipher.js b/src/crypto/cipher/getCipher.js
new file mode 100644
index 00000000..a74ef75a
--- /dev/null
+++ b/src/crypto/cipher/getCipher.js
@@ -0,0 +1,13 @@
+import * as cipher from '.';
+import enums from '../../enums';
+
+/**
+ * Get implementation of the given cipher
+ * @param {enums.symmetric} algo
+ * @returns {Object}
+ * @throws {Error} on invalid algo
+ */
+export default function getCipher(algo) {
+  const algoName = enums.read(enums.symmetric, algo);
+  return cipher[algoName];
+}
diff --git a/src/crypto/crypto.js b/src/crypto/crypto.js
index f198d9d5..d05e4fe9 100644
--- a/src/crypto/crypto.js
+++ b/src/crypto/crypto.js
@@ -25,9 +25,9 @@
  */
 
 import publicKey from './public_key';
-import * as cipher from './cipher';
 import mode from './mode';
 import { getRandomBytes } from './random';
+import getCipher from './cipher/getCipher';
 import ECDHSymkey from '../type/ecdh_symkey';
 import KDFParams from '../type/kdf_params';
 import enums from '../enums';
@@ -385,16 +385,7 @@ export function getAEADMode(algo) {
   return mode[algoName];
 }
 
-/**
- * Get implementation of the given cipher
- * @param {enums.symmetric} algo
- * @returns {Object}
- * @throws {Error} on invalid algo
- */
-export function getCipher(algo) {
-  const algoName = enums.read(enums.symmetric, algo);
-  return cipher[algoName];
-}
+export { getCipher };
 
 /**
  * Check whether the given curve OID is supported
diff --git a/src/crypto/mode/cfb.js b/src/crypto/mode/cfb.js
index 9629de4b..69eae29d 100644
--- a/src/crypto/mode/cfb.js
+++ b/src/crypto/mode/cfb.js
@@ -24,8 +24,7 @@
 
 import { AES_CFB } from '@openpgp/asmcrypto.js/dist_es8/aes/cfb';
 import * as stream from '@openpgp/web-stream-tools';
-import { getCipher } from '../crypto';
-import * as cipher from '../cipher';
+import getCipher from '../cipher/getCipher';
 import util from '../../util';
 import enums from '../../enums';
 
@@ -62,7 +61,8 @@ export async function encrypt(algo, key, plaintext, iv, config) {
     return aesEncrypt(algo, key, plaintext, iv, config);
   }
 
-  const cipherfn = new cipher[algoName](key);
+  const Cipher = getCipher(algo);
+  const cipherfn = new Cipher(key);
   const block_size = cipherfn.blockSize;
 
   const blockc = iv.slice();
@@ -104,7 +104,8 @@ export async function decrypt(algo, key, ciphertext, iv) {
     return aesDecrypt(algo, key, ciphertext, iv);
   }
 
-  const cipherfn = new cipher[algoName](key);
+  const Cipher = getCipher(algo);
+  const cipherfn = new Cipher(key);
   const block_size = cipherfn.blockSize;
 
   let blockp = iv;
diff --git a/src/crypto/public_key/elliptic/ecdh.js b/src/crypto/public_key/elliptic/ecdh.js
index b0f183f5..50c43a4c 100644
--- a/src/crypto/public_key/elliptic/ecdh.js
+++ b/src/crypto/public_key/elliptic/ecdh.js
@@ -31,7 +31,7 @@ import util from '../../../util';
 import { b64ToUint8Array } from '../../../encoding/base64';
 import * as pkcs5 from '../../pkcs5';
 import { keyFromPublic, keyFromPrivate, getIndutnyCurve } from './indutnyKey';
-import { getCipher } from '../../crypto';
+import getCipher from '../../cipher/getCipher';
 
 const webCrypto = util.getWebCrypto();
 const nodeCrypto = util.getNodeCrypto();
diff --git a/src/key/factory.js b/src/key/factory.js
index a4705b9d..b2477960 100644
--- a/src/key/factory.js
+++ b/src/key/factory.js
@@ -26,7 +26,7 @@ import {
   UserAttributePacket
 } from '../packet';
 import PrivateKey from './private_key';
-import { createKey } from './key';
+import PublicKey from './public_key';
 import * as helper from './helper';
 import enums from '../enums';
 import util from '../util';
@@ -44,6 +44,25 @@ const allowedKeyPackets = /*#__PURE__*/ util.constructAllowedPackets([
   SignaturePacket
 ]);
 
+/**
+ * Creates a PublicKey or PrivateKey depending on the packetlist in input
+ * @param {PacketList} - packets to parse
+ * @return {Key} parsed key
+ * @throws if no key packet was found
+ */
+function createKey(packetlist) {
+  for (const packet of packetlist) {
+    switch (packet.constructor.tag) {
+      case enums.packet.secretKey:
+        return new PrivateKey(packetlist);
+      case enums.packet.publicKey:
+        return new PublicKey(packetlist);
+    }
+  }
+  throw new Error('No key packet found');
+}
+
+
 /**
  * Generates a new OpenPGP key. Supports RSA and ECC keys.
  * By default, primary and subkeys will be of same type.
diff --git a/src/key/key.js b/src/key/key.js
index b7e8dc1f..f54e896c 100644
--- a/src/key/key.js
+++ b/src/key/key.js
@@ -26,8 +26,6 @@ import util from '../util';
 import User from './user';
 import Subkey from './subkey';
 import * as helper from './helper';
-import PrivateKey from './private_key';
-import PublicKey from './public_key';
 import { UnparseablePacket } from '../packet/packet';
 
 // A key revocation certificate can contain the following packets
@@ -710,21 +708,3 @@ class Key {
 });
 
 export default Key;
-
-/**
- * Creates a PublicKey or PrivateKey depending on the packetlist in input
- * @param {PacketList} - packets to parse
- * @return {Key} parsed key
- * @throws if no key packet was found
- */
-export function createKey(packetlist) {
-  for (const packet of packetlist) {
-    switch (packet.constructor.tag) {
-      case enums.packet.secretKey:
-        return new PrivateKey(packetlist);
-      case enums.packet.publicKey:
-        return new PublicKey(packetlist);
-    }
-  }
-  throw new Error('No key packet found');
-}