From 46aaf8fa9a30cbe1c1410e59e70caa9e202c4cf0 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Mon, 20 Jan 2020 04:51:44 +0900
Subject: AP Actorの鍵とkeyIdのフォーマットの変更 (#5733)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Node PKCS#8

* keyIdを#main-key形式に
---
 src/server/api/private/signup.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/server/api/private')

diff --git a/src/server/api/private/signup.ts b/src/server/api/private/signup.ts
index 63216019e9..af1aefda84 100644
--- a/src/server/api/private/signup.ts
+++ b/src/server/api/private/signup.ts
@@ -91,21 +91,21 @@ export default async (ctx: Koa.Context) => {
 		return;
 	}
 
-	const keyPair = await new Promise<string[]>((s, j) =>
+	const keyPair = await new Promise<string[]>((res, rej) =>
 		generateKeyPair('rsa', {
 			modulusLength: 4096,
 			publicKeyEncoding: {
-				type: 'pkcs1',
+				type: 'spki',
 				format: 'pem'
 			},
 			privateKeyEncoding: {
-				type: 'pkcs1',
+				type: 'pkcs8',
 				format: 'pem',
 				cipher: undefined,
 				passphrase: undefined
 			}
-		} as any, (e, publicKey, privateKey) =>
-			e ? j(e) : s([publicKey, privateKey])
+		} as any, (err, publicKey, privateKey) =>
+			err ? rej(err) : res([publicKey, privateKey])
 		));
 
 	let account!: User;
-- 
cgit v1.2.3-freya