diff --git a/components.d.ts b/components.d.ts
index e31119b3..f2ff8a1a 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -130,27 +130,24 @@ declare module '@vue/runtime-core' {
     NCode: typeof import('naive-ui')['NCode']
     NCollapseTransition: typeof import('naive-ui')['NCollapseTransition']
     NConfigProvider: typeof import('naive-ui')['NConfigProvider']
-    NDivider: typeof import('naive-ui')['NDivider']
     NEllipsis: typeof import('naive-ui')['NEllipsis']
     NFormItem: typeof import('naive-ui')['NFormItem']
-    NGi: typeof import('naive-ui')['NGi']
-    NGrid: typeof import('naive-ui')['NGrid']
     NH1: typeof import('naive-ui')['NH1']
     NH3: typeof import('naive-ui')['NH3']
     NIcon: typeof import('naive-ui')['NIcon']
+    NInput: typeof import('naive-ui')['NInput']
     NInputNumber: typeof import('naive-ui')['NInputNumber']
-    NLabel: typeof import('naive-ui')['NLabel']
     NLayout: typeof import('naive-ui')['NLayout']
     NLayoutSider: typeof import('naive-ui')['NLayoutSider']
     NMenu: typeof import('naive-ui')['NMenu']
     NScrollbar: typeof import('naive-ui')['NScrollbar']
-    NSpin: typeof import('naive-ui')['NSpin']
     NumeronymGenerator: typeof import('./src/tools/numeronym-generator/numeronym-generator.vue')['default']
     OtpCodeGeneratorAndValidator: typeof import('./src/tools/otp-code-generator-and-validator/otp-code-generator-and-validator.vue')['default']
     PasswordStrengthAnalyser: typeof import('./src/tools/password-strength-analyser/password-strength-analyser.vue')['default']
     PdfSignatureChecker: typeof import('./src/tools/pdf-signature-checker/pdf-signature-checker.vue')['default']
     PdfSignatureDetails: typeof import('./src/tools/pdf-signature-checker/components/pdf-signature-details.vue')['default']
     PercentageCalculator: typeof import('./src/tools/percentage-calculator/percentage-calculator.vue')['default']
+    PgpKeygen: typeof import('./src/tools/pgp-keygen/pgp-keygen.vue')['default']
     PhoneParserAndFormatter: typeof import('./src/tools/phone-parser-and-formatter/phone-parser-and-formatter.vue')['default']
     QrCodeGenerator: typeof import('./src/tools/qr-code-generator/qr-code-generator.vue')['default']
     RandomPortGenerator: typeof import('./src/tools/random-port-generator/random-port-generator.vue')['default']
@@ -159,6 +156,7 @@ declare module '@vue/runtime-core' {
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     RsaKeyPairGenerator: typeof import('./src/tools/rsa-key-pair-generator/rsa-key-pair-generator.vue')['default']
+    SafelinkDecoder: typeof import('./src/tools/safelink-decoder/safelink-decoder.vue')['default']
     SlugifyString: typeof import('./src/tools/slugify-string/slugify-string.vue')['default']
     SpanCopyable: typeof import('./src/components/SpanCopyable.vue')['default']
     SqlPrettify: typeof import('./src/tools/sql-prettify/sql-prettify.vue')['default']
diff --git a/package.json b/package.json
index fd6c02e6..d0a31612 100644
--- a/package.json
+++ b/package.json
@@ -75,6 +75,7 @@
     "naive-ui": "^2.35.0",
     "netmask": "^2.0.2",
     "node-forge": "^1.3.1",
+    "openpgp": "^5.11.1",
     "oui-data": "^1.0.10",
     "pdf-signature-reader": "^1.4.2",
     "pinia": "^2.0.34",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bd6c38c9..bbd1b50f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -125,6 +125,9 @@ dependencies:
   node-forge:
     specifier: ^1.3.1
     version: 1.3.1
+  openpgp:
+    specifier: ^5.11.1
+    version: 5.11.1
   oui-data:
     specifier: ^1.0.10
     version: 1.0.10
@@ -3351,7 +3354,7 @@ packages:
     dependencies:
       '@unhead/dom': 0.5.1
       '@unhead/schema': 0.5.1
-      '@vueuse/shared': 10.7.2(vue@3.3.4)
+      '@vueuse/shared': 10.9.0(vue@3.3.4)
       unhead: 0.5.1
       vue: 3.3.4
     transitivePeerDependencies:
@@ -3993,10 +3996,10 @@ packages:
       - vue
     dev: false
 
-  /@vueuse/shared@10.7.2(vue@3.3.4):
-    resolution: {integrity: sha512-qFbXoxS44pi2FkgFjPvF4h7c9oMDutpyBdcJdMYIMg9XyXli2meFMuaKn+UMgsClo//Th6+beeCgqweT/79BVA==}
+  /@vueuse/shared@10.9.0(vue@3.3.4):
+    resolution: {integrity: sha512-Uud2IWncmAfJvRaFYzv5OHDli+FbOzxiVEQdLCKQKLyhz94PIyFC3CHcH7EDMwIn8NPtD06+PNbC/PiO0LGLtw==}
     dependencies:
-      vue-demi: 0.14.6(vue@3.3.4)
+      vue-demi: 0.14.7(vue@3.3.4)
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
@@ -4135,6 +4138,15 @@ packages:
       is-shared-array-buffer: 1.0.2
     dev: true
 
+  /asn1.js@5.4.1:
+    resolution: {integrity: sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==}
+    dependencies:
+      bn.js: 4.12.0
+      inherits: 2.0.4
+      minimalistic-assert: 1.0.1
+      safer-buffer: 2.1.2
+    dev: false
+
   /assertion-error@1.1.0:
     resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==}
     dev: true
@@ -4229,6 +4241,10 @@ packages:
       readable-stream: 3.6.2
     dev: true
 
+  /bn.js@4.12.0:
+    resolution: {integrity: sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==}
+    dev: false
+
   /boolbase@1.0.0:
     resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
     dev: true
@@ -6905,6 +6921,10 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
+  /minimalistic-assert@1.0.1:
+    resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==}
+    dev: false
+
   /minimatch@3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
     dependencies:
@@ -7172,6 +7192,13 @@ packages:
       is-wsl: 2.2.0
     dev: true
 
+  /openpgp@5.11.1:
+    resolution: {integrity: sha512-TynUBPuaSI7dN0gP+A38CjNRLxkOkkptefNanalDQ71BFAKKm+dLbksymSW5bUrB7RcAneMySL/Y+r/TbLpOnQ==}
+    engines: {node: '>= 8.0.0'}
+    dependencies:
+      asn1.js: 5.4.1
+    dev: false
+
   /optionator@0.9.3:
     resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
     engines: {node: '>= 0.8.0'}
@@ -7947,7 +7974,6 @@ packages:
   /safer-buffer@2.1.2:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
     requiresBuild: true
-    dev: true
 
   /sax@1.2.4:
     resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==}
@@ -9151,8 +9177,8 @@ packages:
       vue: 3.3.4
     dev: false
 
-  /vue-demi@0.14.6(vue@3.3.4):
-    resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==}
+  /vue-demi@0.14.7(vue@3.3.4):
+    resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==}
     engines: {node: '>=12'}
     hasBin: true
     requiresBuild: true
@@ -9442,6 +9468,7 @@ packages:
 
   /workbox-google-analytics@7.0.0:
     resolution: {integrity: sha512-MEYM1JTn/qiC3DbpvP2BVhyIH+dV/5BjHk756u9VbwuAhu0QHyKscTnisQuz21lfRpOwiS9z4XdqeVAKol0bzg==}
+    deprecated: It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained
     dependencies:
       workbox-background-sync: 7.0.0
       workbox-core: 7.0.0
diff --git a/src/tools/index.ts b/src/tools/index.ts
index aa861c93..e5df3f55 100644
--- a/src/tools/index.ts
+++ b/src/tools/index.ts
@@ -6,6 +6,7 @@ import { tool as asciiTextDrawer } from './ascii-text-drawer';
 
 import { tool as textToUnicode } from './text-to-unicode';
 import { tool as safelinkDecoder } from './safelink-decoder';
+import { tool as pgpKeygen } from './pgp-keygen';
 import { tool as pdfSignatureChecker } from './pdf-signature-checker';
 import { tool as numeronymGenerator } from './numeronym-generator';
 import { tool as macAddressGenerator } from './mac-address-generator';
@@ -85,7 +86,20 @@ import { tool as yamlViewer } from './yaml-viewer';
 export const toolsByCategory: ToolCategory[] = [
   {
     name: 'Crypto',
-    components: [tokenGenerator, hashText, bcrypt, uuidGenerator, ulidGenerator, cypher, bip39, hmacGenerator, rsaKeyPairGenerator, passwordStrengthAnalyser, pdfSignatureChecker],
+    components: [
+      tokenGenerator,
+      hashText,
+      bcrypt,
+      uuidGenerator,
+      ulidGenerator,
+      cypher,
+      bip39,
+      hmacGenerator,
+      rsaKeyPairGenerator,
+      passwordStrengthAnalyser,
+      pdfSignatureChecker,
+      pgpKeygen,
+    ],
   },
   {
     name: 'Converter',
diff --git a/src/tools/pgp-keygen/index.ts b/src/tools/pgp-keygen/index.ts
new file mode 100644
index 00000000..0ec69a54
--- /dev/null
+++ b/src/tools/pgp-keygen/index.ts
@@ -0,0 +1,12 @@
+import { Certificate } from '@vicons/tabler';
+import { defineTool } from '../tool';
+
+export const tool = defineTool({
+  name: 'PGP keygen',
+  path: '/pgp-key-pair-generator',
+  description: 'Generate new random PGP private and public keys (with or without passphrase).',
+  keywords: ['pgp', 'key', 'pair', 'generator', 'public', 'private', 'secret', 'ssh', 'pem', 'passphrase', 'password'],
+  component: () => import('./pgp-keygen.vue'),
+  icon: Certificate,
+  createdAt: new Date('2024-04-20'),
+});
diff --git a/src/tools/pgp-keygen/pgp-keygen.vue b/src/tools/pgp-keygen/pgp-keygen.vue
new file mode 100644
index 00000000..55834ca2
--- /dev/null
+++ b/src/tools/pgp-keygen/pgp-keygen.vue
@@ -0,0 +1,136 @@
+<script setup lang="ts">
+import * as openpgp from 'openpgp';
+import TextareaCopyable from '@/components/TextareaCopyable.vue';
+import { useValidation } from '@/composable/validation';
+import { computedRefreshableAsync } from '@/composable/computedRefreshable';
+
+const bits = ref(4096);
+const username = ref('');
+const useremail = ref('');
+const password = ref('');
+
+const format = useStorage('pgp-key-pair-generator:format', 'curve25519');
+const formats = [
+  'rsa',
+  'curve25519',
+  'ed25519',
+  'p256', 'p384', 'p521',
+  'brainpoolP256r1', 'brainpoolP384r1', 'brainpoolP512r1',
+  'secp256k1',
+];
+
+const { attrs: bitsValidationAttrs } = useValidation({
+  source: bits,
+  rules: [
+    {
+      message: 'Bits should be 256 <= bits <= 16384 and be a multiple of 8',
+      validator: value => value >= 256 && value <= 16384 && value % 8 === 0,
+    },
+  ],
+});
+
+const [certs, refreshCerts] = computedRefreshableAsync(
+  async () => {
+    const formatValue = format.value;
+    const passphrase = password.value;
+    const name = username.value;
+    const email = useremail.value;
+    const rsaBits = bits.value;
+
+    try {
+      if (format.value === 'rsa') {
+        const { privateKey, publicKey } = await openpgp.generateKey({
+          type: 'rsa', // Type of the key
+          rsaBits, // RSA key size (defaults to 4096 bits)
+          userIDs: [{ name, email }], // you can pass multiple user IDs
+          passphrase, // protects the private key
+          format: 'armored',
+        });
+
+        return { privateKey, publicKey, revocationCertificate: '' };
+      }
+
+      const { privateKey, publicKey, revocationCertificate } = await openpgp.generateKey({
+        type: 'ecc', // Type of the key, defaults to ECC
+        curve: formatValue as openpgp.EllipticCurveName, // ECC curve name, defaults to curve25519
+        userIDs: [{ name, email }], // you can pass multiple user IDs
+        passphrase, // protects the private key
+        format: 'armored',
+      });
+      return { privateKey, publicKey, revocationCertificate };
+    }
+    catch (e: any) {
+      return { privateKey: `#${e.toString()}`, publicKey: `#${e.toString()}`, revocationCertificate: '' };
+    }
+  }, { privateKey: '', publicKey: '', revocationCertificate: '' },
+);
+</script>
+
+<template>
+  <div>
+    <div mb-4>
+      <div style="flex: 0 0 100%">
+        <div item-style="flex: 1 1 0" style="max-width: 600px" mx-auto flex gap-3>
+          <c-select
+            v-model:value="format"
+            label-position="left"
+            label="Format:"
+            :options="formats"
+            placeholder="Select a key format"
+          />
+
+          <n-form-item v-if="format === 'rsa'" label="RSA Bits :" v-bind="bitsValidationAttrs as any" label-placement="left">
+            <n-input-number v-model:value="bits" min="256" max="16384" step="8" />
+          </n-form-item>
+        </div>
+      </div>
+    </div>
+
+    <div>
+      <n-form-item label="User Name :" label-placement="left">
+        <n-input
+          v-model:value="username"
+          type="text"
+          placeholder="User Name"
+        />
+      </n-form-item>
+      <n-form-item label="User Email :" label-placement="left">
+        <n-input
+          v-model:value="useremail"
+          :input-props="{ type: 'email' }"
+          placeholder="User Email"
+        />
+      </n-form-item>
+
+      <n-form-item label="Passphrase :" label-placement="left">
+        <n-input
+          v-model:value="password"
+          type="password"
+          show-password-on="mousedown"
+          placeholder="Passphrase"
+        />
+      </n-form-item>
+
+      <div text-center>
+        <c-button @click="refreshCerts">
+          Refresh key-pair
+        </c-button>
+      </div>
+    </div>
+
+    <div>
+      <h3>Public key</h3>
+      <TextareaCopyable :value="certs?.publicKey || ''" word-wrap="true" />
+    </div>
+
+    <div>
+      <h3>Private key</h3>
+      <TextareaCopyable :value="certs?.privateKey || ''" word-wrap="true" />
+    </div>
+
+    <div>
+      <h3>Revocation Certificate</h3>
+      <TextareaCopyable :value="certs?.revocationCertificate || ''" word-wrap="true" />
+    </div>
+  </div>
+</template>