diff --git a/src/tools/rsa-key-pair-generator/index.ts b/src/tools/rsa-key-pair-generator/index.ts
index 3d034e5b..4c844707 100644
--- a/src/tools/rsa-key-pair-generator/index.ts
+++ b/src/tools/rsa-key-pair-generator/index.ts
@@ -5,8 +5,8 @@ import { translate } from '@/plugins/i18n.plugin';
export const tool = defineTool({
name: translate('tools.rsa-key-pair-generator.title'),
path: '/rsa-key-pair-generator',
- description: translate('tools.rsa-key-pair-generator.description'),
- keywords: ['rsa', 'key', 'pair', 'generator', 'public', 'private', 'secret', 'ssh', 'pem'],
+ description: 'Generate new random RSA private and public keys (with or without passphrase).',
+ keywords: ['rsa', 'key', 'pair', 'generator', 'public', 'private', 'secret', 'ssh', 'pem', 'passphrase', 'password'],
component: () => import('./rsa-key-pair-generator.vue'),
icon: Certificate,
});
diff --git a/src/tools/rsa-key-pair-generator/rsa-key-pair-generator.service.ts b/src/tools/rsa-key-pair-generator/rsa-key-pair-generator.service.ts
index 1cb1f1ae..34b06f26 100644
--- a/src/tools/rsa-key-pair-generator/rsa-key-pair-generator.service.ts
+++ b/src/tools/rsa-key-pair-generator/rsa-key-pair-generator.service.ts
@@ -1,5 +1,6 @@
import { pki } from 'node-forge';
import workerScript from 'node-forge/dist/prime.worker.min?url';
+import sshpk from 'sshpk';
export { generateKeyPair };
@@ -16,11 +17,39 @@ function generateRawPairs({ bits = 2048 }) {
);
}
-async function generateKeyPair(config: { bits?: number } = {}) {
+async function generateKeyPair(config: {
+ bits?: number
+ password?: string
+ format?: sshpk.PrivateKeyFormatType
+ comment?: string
+} = {}) {
const { privateKey, publicKey } = await generateRawPairs(config);
+ const privateUnencryptedKeyPem = pki.privateKeyToPem(privateKey);
+
+ if (config?.format === 'pem') {
+ return {
+ publicKey: pki.publicKeyToPem(publicKey),
+ privateKey: config?.password
+ ? pki.encryptRsaPrivateKey(privateKey, config?.password)
+ : privateUnencryptedKeyPem,
+ };
+ }
+
+ const privKey = sshpk.parsePrivateKey(privateUnencryptedKeyPem);
+ privKey.comment = config?.comment;
+ const pubFormat = config.format ?? 'ssh';
+ let privFormat = config.format ?? 'ssh';
+ if (privFormat === 'ssh') {
+ privFormat = 'ssh-private';
+ }
+ const pubKey = privKey.toPublic();
return {
- publicKeyPem: pki.publicKeyToPem(publicKey),
- privateKeyPem: pki.privateKeyToPem(privateKey),
+ publicKey: pubKey.toString(pubFormat),
+ privateKey: config?.password
+ ? privKey.toString(privFormat,
+ { passphrase: config?.password, comment: config?.comment },
+ )
+ : privKey.toString(privFormat, { comment: config?.comment }),
};
}
diff --git a/src/tools/rsa-key-pair-generator/rsa-key-pair-generator.vue b/src/tools/rsa-key-pair-generator/rsa-key-pair-generator.vue
index 7f972464..3ca9f7bd 100644
--- a/src/tools/rsa-key-pair-generator/rsa-key-pair-generator.vue
+++ b/src/tools/rsa-key-pair-generator/rsa-key-pair-generator.vue
@@ -1,4 +1,5 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Refresh key-pair
+
+
+
+
Public key
+
+
+
+
+
Private key
+
-
Public key
-
-
-
-
-
Private key
-
-
diff --git a/vite.config.ts b/vite.config.ts
index 42a2cb29..06270f3a 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,20 +1,21 @@
-import { resolve } from 'node:path';
import { URL, fileURLToPath } from 'node:url';
+import { resolve } from 'node:path';
+import { nodePolyfills } from 'vite-plugin-node-polyfills';
-import VueI18n from '@intlify/unplugin-vue-i18n/vite';
+import { defineConfig } from 'vite';
import vue from '@vitejs/plugin-vue';
import vueJsx from '@vitejs/plugin-vue-jsx';
-import Unocss from 'unocss/vite';
-import AutoImport from 'unplugin-auto-import/vite';
-import IconsResolver from 'unplugin-icons/resolver';
-import Icons from 'unplugin-icons/vite';
-import { NaiveUiResolver } from 'unplugin-vue-components/resolvers';
-import Components from 'unplugin-vue-components/vite';
-import { defineConfig } from 'vite';
-import { VitePWA } from 'vite-plugin-pwa';
import markdown from 'vite-plugin-vue-markdown';
import svgLoader from 'vite-svg-loader';
+import { VitePWA } from 'vite-plugin-pwa';
+import AutoImport from 'unplugin-auto-import/vite';
+import Components from 'unplugin-vue-components/vite';
+import { NaiveUiResolver } from 'unplugin-vue-components/resolvers';
+import Unocss from 'unocss/vite';
import { configDefaults } from 'vitest/config';
+import Icons from 'unplugin-icons/vite';
+import IconsResolver from 'unplugin-icons/resolver';
+import VueI18n from '@intlify/unplugin-vue-i18n/vite';
const baseUrl = process.env.BASE_URL ?? '/';
@@ -23,13 +24,10 @@ export default defineConfig({
plugins: [
VueI18n({
runtimeOnly: true,
- jitCompilation: true,
compositionOnly: true,
fullInstall: true,
+ include: [resolve(__dirname, 'locales/**')],
strictMessage: false,
- include: [
- resolve(__dirname, 'locales/**'),
- ],
}),
AutoImport({
imports: [
@@ -97,6 +95,7 @@ export default defineConfig({
resolvers: [NaiveUiResolver(), IconsResolver({ prefix: 'icon' })],
}),
Unocss(),
+ nodePolyfills(),
],
base: baseUrl,
resolve: {