oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

Merge remote-tracking branch 'misskey-dev/develop' into io

Browse source
This commit is contained in:
まっちゃとーにゅ 2024-03-15 13:08:54 +09:00
commit acab2bfc72
No known key found for this signature in database
GPG key ID: 6AFBBF529601C1DB
83 changed files with 1149 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

3
packages/backend/src/core/WebAuthnService.ts
View file

@ -12,7 +12,6 @@ import {
verifyRegistrationResponse,
} from '@simplewebauthn/server';
import { AttestationFormat, isoCBOR } from '@simplewebauthn/server/helpers';
import { tinyCbor } from '@simplewebauthn/server/esm/deps.js';
import { DI } from '@/di-symbols.js';
import type { UserSecurityKeysRepository } from '@/models/_.js';
import type { Config } from '@/config.js';
@ -199,7 +198,7 @@ export class WebAuthnService {
if (cert[0] === 0x04) { // 前の実装ではいつも 0x04 で始まっていた
const halfLength = (cert.length - 1) / 2;
const cborMap = new Map<number, tinyCbor.CBORType>();
const cborMap = new Map<number, number | Uint8Array>();
cborMap.set(1, 2); // kty, EC2
cborMap.set(3, -7); // alg, ES256
cborMap.set(-1, 1); // crv, P256