vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-10-04 14:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15309 from ioancole/master

Browse Source 
Added new method and test, fixing lint. Patch number updated...
This commit is contained in:
Paul van Brenk
2017-03-22 11:48:10 -07:00
committed by GitHub
parent f5a0e10a55 295172d48b
commit 19ee3a73e5
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
node-forge/index.d.ts
Vendored
+4 -3
View File
@@ -1,4 +1,4 @@
// Type definitions for node-forge 0.6.42
// Type definitions for node-forge 0.6.43
// Project: https://github.com/digitalbazaar/forge
// Definitions by: Seth Westphal <https://github.com/westy92>
// Kay Schecker <https://github.com/flynetworks>
@@ -24,6 +24,7 @@ declare module "node-forge" {
function privateKeyToPem(key: Key, maxline?: number): PEM;
function publicKeyToPem(key: Key, maxline?: number): PEM;
function publicKeyFromPem(pem: PEM): Key;
function certificateToPem(cert: Certificate, maxline?: number): PEM;
interface oids {
@@ -269,7 +270,7 @@ declare module "node-forge" {
getBagsByLocalKeyId: (localKeyId: string, bagType: string) => Bag[]
}
function pkcs12FromAsn1(obj:any, strict?: boolean, password?: string) : Pkcs12Pfx;
function pkcs12FromAsn1(obj:any, password?: string) : Pkcs12Pfx;
function pkcs12FromAsn1(obj: any, strict?: boolean, password?: string) : Pkcs12Pfx;
function pkcs12FromAsn1(obj: any, password?: string) : Pkcs12Pfx;
}
}
node-forge/node-forge-tests.ts
+10 -8
View File
@@ -5,6 +5,8 @@ let privateKeyPem = forge.pki.privateKeyToPem(keypair.privateKey);
let publicKeyPem = forge.pki.publicKeyToPem(keypair.publicKey);
let key = forge.pki.decryptRsaPrivateKey(privateKeyPem);
let x: string = forge.ssh.privateKeyToOpenSSH(key);
let pemKey: forge.pki.PEM;
let publicKeyRsa = forge.pki.publicKeyFromPem(pemKey);
{
let subjectPublicKeyInfo = forge.asn1.create(forge.asn1.Class.UNIVERSAL, forge.asn1.Type.SEQUENCE, true, [
@@ -29,16 +31,16 @@ let x: string = forge.ssh.privateKeyToOpenSSH(key);
let oidSrc = '1.2.840.113549.1.1.5';
let derOidBuffer = forge.asn1.oidToDer(oidSrc);
let oidResult = forge.asn1.derToOid(derOidBuffer);
if(oidSrc !== oidResult) throw Error('forge.asn1.oidToDer / derToOid fail');
if (oidSrc !== oidResult) throw Error('forge.asn1.oidToDer / derToOid fail');
}
if(forge.util.fillString('1', 5) !== '11111') throw Error('forge.util.fillString fail');
if (forge.util.fillString('1', 5) !== '11111') throw Error('forge.util.fillString fail');
{
let hex: string = '61';
let bytes: string = forge.util.hexToBytes(hex);
let result: string = forge.util.bytesToHex(bytes);
if(bytes !== 'a' || result !== hex) throw Error('forge.util.hexToBytes / bytesToHex fail');
if (bytes !== 'a' || result !== hex) throw Error('forge.util.hexToBytes / bytesToHex fail');
}
{
@@ -49,17 +51,17 @@ if(forge.util.fillString('1', 5) !== '11111') throw Error('forge.util.fillString
src = new Uint8Array(2);
encode = forge.util.binary.hex.encode(src);
decode = forge.util.binary.hex.decode(encode);
if(encode !== '0000' || src.byteLength !== decode.byteLength) throw Error('forge.util.binary.hex.encode / decode fail');
if (encode !== '0000' || src.byteLength !== decode.byteLength) throw Error('forge.util.binary.hex.encode / decode fail');
src = new Uint8Array(2);
encode = forge.util.binary.base64.encode(src);
decode = forge.util.binary.base64.decode(encode);
if(encode !== 'AAA=' || src.byteLength !== decode.byteLength) throw Error('forge.util.binary.base64.encode / decode fail');
if (encode !== 'AAA=' || src.byteLength !== decode.byteLength) throw Error('forge.util.binary.base64.encode / decode fail');
src = new Uint8Array(10);
encode = forge.util.binary.raw.encode(src);
decode = forge.util.binary.raw.decode(encode);
if(src.byteLength !== decode.byteLength) throw Error('forge.util.binary.raw.encode / decode fail');
if (src.byteLength !== decode.byteLength) throw Error('forge.util.binary.raw.encode / decode fail');
}
{
@@ -70,9 +72,9 @@ if(forge.util.fillString('1', 5) !== '11111') throw Error('forge.util.fillString
src = 'Test';
encode = forge.util.text.utf8.encode(src);
decode = forge.util.text.utf8.decode(encode);
if(src !== decode) throw Error('forge.util.text.utf8.encode / decode fail');
if (src !== decode) throw Error('forge.util.text.utf8.encode / decode fail');
src = 'Test';
encode = forge.util.text.utf16.encode(src);
decode = forge.util.text.utf16.decode(encode);
if(src !== decode) throw Error('forge.util.text.utf8.encode / decode fail');
if (src !== decode) throw Error('forge.util.text.utf8.encode / decode fail');
}