From 4db54a35f7d3b71339b86fc6695a8bc5df9429f6 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 5 Jul 2019 02:00:54 +0900
Subject: [PATCH] Fix errors

---
 src/server/api/2fa.ts                      | 8 ++++----
 src/server/api/endpoints/i/2fa/key-done.ts | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/server/api/2fa.ts b/src/server/api/2fa.ts
index bc5f6e6d7..3bc4627a6 100644
--- a/src/server/api/2fa.ts
+++ b/src/server/api/2fa.ts
@@ -63,15 +63,15 @@ function verifyCertificateChain(certificates: string[]) {
 
 		const CACert = i + 1 >= certificates.length ? Cert : certificates[i + 1];
 
-		const certStruct = jsrsasign.ASN1HEX.getTLVbyList(certificate.hex, 0, [0]);
+		const certStruct = jsrsasign.ASN1HEX.getTLVbyList(certificate.hex!, 0, [0]);
 		const algorithm = certificate.getSignatureAlgorithmField();
 		const signatureHex = certificate.getSignatureValueHex();
 
 		// Verify against CA
-		const Signature = new jsrsasign.crypto.Signature({alg: algorithm});
+		const Signature = new jsrsasign.KJUR.crypto.Signature({alg: algorithm});
 		Signature.init(CACert);
 		Signature.updateHex(certStruct);
-		valid = valid && Signature.verify(signatureHex); // true if CA signed the certificate
+		valid = valid && !!Signature.verify(signatureHex); // true if CA signed the certificate
 	}
 
 	return valid;
@@ -260,7 +260,7 @@ export const procedures = {
 			}
 
 			const certificateChain = header.x5c
-				.map(key => PEMString(key))
+				.map((key: any) => PEMString(key))
 				.concat([GSR2]);
 
 			if (getCertSubject(certificateChain[0]).CN != 'attest.android.com') {
diff --git a/src/server/api/endpoints/i/2fa/key-done.ts b/src/server/api/endpoints/i/2fa/key-done.ts
index 074ab22bf..d751dabc4 100644
--- a/src/server/api/endpoints/i/2fa/key-done.ts
+++ b/src/server/api/endpoints/i/2fa/key-done.ts
@@ -14,7 +14,7 @@ import config from '../../../../../config';
 import { procedures, hash } from '../../../2fa';
 import { publishMainStream } from '../../../../../services/stream';
 
-const cborDecodeFirst = promisify(cbor.decodeFirst);
+const cborDecodeFirst = promisify(cbor.decodeFirst) as any;
 
 export const meta = {
 	requireCredential: true,
@@ -90,11 +90,11 @@ export default define(meta, async (ps, user) => {
 		throw new Error('alg mismatch');
 	}
 
-	if (!procedures[attestation.fmt]) {
+	if (!(procedures as any)[attestation.fmt]) {
 		throw new Error('unsupported fmt');
 	}
 
-	const verificationData = procedures[attestation.fmt].verify({
+	const verificationData = (procedures as any)[attestation.fmt].verify({
 		attStmt: attestation.attStmt,
 		authenticatorData: authData,
 		clientDataHash: clientDataJSONHash,