summaryrefslogtreecommitdiff
path: root/src/@types
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2020-03-21 13:36:41 +0900
committersyuilo <syuilotan@yahoo.co.jp>2020-03-21 13:36:41 +0900
commit6fb7721798657cf842556fb63f116316365efa74 (patch)
tree6917342553156b6483b899eafc66ef8f040b8352 /src/@types
parentUpdate CHANGELOG.md (diff)
parent12.22.0 (diff)
downloadmisskey-6fb7721798657cf842556fb63f116316365efa74.tar.gz
misskey-6fb7721798657cf842556fb63f116316365efa74.tar.bz2
misskey-6fb7721798657cf842556fb63f116316365efa74.zip
Merge branch 'develop'
Diffstat (limited to 'src/@types')
-rw-r--r--src/@types/jsrsasign.d.ts9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/@types/jsrsasign.d.ts b/src/@types/jsrsasign.d.ts
index 55bebd9bfb..bc9d746f7e 100644
--- a/src/@types/jsrsasign.d.ts
+++ b/src/@types/jsrsasign.d.ts
@@ -171,6 +171,7 @@ declare module 'jsrsasign' {
public static getTLVbyList(h: ASN1S, currentIndex: Idx<ASN1ObjectString>, nthList: Mutable<Nth[]>, checkingTag?: string): ASN1TLV;
+ // tslint:disable-next-line:bool-param-default
public static getVbyList(h: ASN1S, currentIndex: Idx<ASN1ObjectString>, nthList: Mutable<Nth[]>, checkingTag?: string, removeUnusedbits?: boolean): ASN1V;
public static hextooidstr(hex: ASN1OIDV): OID;
@@ -620,9 +621,7 @@ declare module 'jsrsasign' {
public encrypt(text: string): HexString | null;
- public encryptOAEP(text: string, hash?: string, hashLen?: number): HexString | null;
-
- public encryptOAEP(text: string, hash?: (s: string) => string, hashLen?: number): HexString | null;
+ public encryptOAEP(text: string, hash?: string | ((s: string) => string), hashLen?: number): HexString | null;
//// RSA PRIVATE
@@ -638,9 +637,7 @@ declare module 'jsrsasign' {
public decrypt(ctext: HexString): string;
- public decryptOAEP(ctext: HexString, hash?: string, hashLen?: number): string | null;
-
- public encryptOAEP(ctext: HexString, hash?: (s: string) => string, hashLen?: number): string | null;
+ public decryptOAEP(ctext: HexString, hash?: string | ((s: string) => string), hashLen?: number): string | null;
//// RSA PEM