fix: cipher function signatures now match Node spec again (margelo#439)

Author: boorad

src/Cipher.ts

@@ -408,11 +408,11 @@ function rsaFunctionFor(
     data: ArrayBuffer,
     format: KFormatType,
     type: KeyEncoding | undefined,
-    passphrase: string | ArrayBuffer | undefined,
+    passphrase: BinaryLike | undefined,
     buffer: ArrayBuffer,
     padding: number,
-    oaepHash: ArrayBuffer | undefined,
-    oaepLabel: ArrayBuffer | undefined,
+    oaepHash: string | undefined,
+    oaepLabel: BinaryLike | undefined,
   ) => Buffer,
   defaultPadding: number,
   keyType: 'public' | 'private',

src/NativeQuickCrypto/Cipher.ts

@@ -62,21 +62,21 @@ export type PublicEncryptMethod = (
   data: ArrayBuffer,
   format: number,
   type: KeyEncoding | undefined,
-  passphrase: string | ArrayBuffer | undefined,
+  passphrase: BinaryLike | undefined,
   buffer: ArrayBuffer,
   padding: number,
-  oaepHash: ArrayBuffer | undefined,
-  oaepLabel: ArrayBuffer | undefined,
+  oaepHash: string | undefined,
+  oaepLabel: BinaryLike | undefined,
 ) => Buffer;
 export type PrivateDecryptMethod = (
   data: ArrayBuffer,
   format: number,
   type: KeyEncoding | undefined,
-  passphrase: string | ArrayBuffer | undefined,
+  passphrase: BinaryLike | undefined,
   buffer: ArrayBuffer,
   padding: number,
-  oaepHash: ArrayBuffer | undefined,
-  oaepLabel: ArrayBuffer | undefined,
+  oaepHash: string | undefined,
+  oaepLabel: BinaryLike | undefined,
 ) => Buffer;
 
 export type GenerateKeyPairMethod = (

src/NativeQuickCrypto/webcrypto.ts

@@ -15,6 +15,7 @@ import type {
 } from './keygen';
 import type { KeyVariant } from './Cipher';
 import type { RSACipher } from './rsa';
+import type { BinaryLike } from '../Utils';
 
 type KeyDetail = {
   length?: number;
@@ -42,7 +43,7 @@ export type KeyObjectHandle = {
     format?: KFormatType,
     type?: KeyEncoding,
     cipher?: string,
-    passphrase?: ArrayBuffer,
+    passphrase?: BinaryLike,
   ): ArrayBuffer;
   exportJwk(key: JWK, handleRsaPss: boolean): JWK;
   getAsymmetricKeyType(): AsymmetricKeyType;
@@ -51,7 +52,7 @@ export type KeyObjectHandle = {
     key: string | ArrayBuffer,
     format?: KFormatType,
     type?: KeyEncoding,
-    passphrase?: string | ArrayBuffer,
+    passphrase?: BinaryLike,
   ): boolean;
   initECRaw(curveName: string, keyData: ArrayBuffer): boolean;
   initJwk(keyData: JWK, namedCurve?: NamedCurve): KeyType | undefined;

src/Utils.ts

@@ -15,7 +15,7 @@ import type {
 import { type CipherKey } from 'crypto'; // @types/node
 
 export type BufferLike = ArrayBuffer | Buffer | SBuffer | ArrayBufferView;
-export type BinaryLike = string | ArrayBuffer | Buffer | SBuffer | TypedArray;
+export type BinaryLike = string | ArrayBuffer | Buffer | SBuffer | TypedArray | DataView;
 export type BinaryLikeNode = CipherKey | BinaryLike;
 
 export type BinaryToTextEncoding = 'base64' | 'base64url' | 'hex' | 'binary';

src/keys.ts

@@ -196,10 +196,10 @@ export type EncodingOptions = {
   format?: KFormat;
   padding?: number;
   cipher?: string;
-  passphrase?: string | ArrayBuffer;
+  passphrase?: BinaryLike;
   saltLength?: number;
-  oaepHash?: ArrayBuffer;
-  oaepLabel?: ArrayBuffer;
+  oaepHash?: string;
+  oaepLabel?: BinaryLike;
 };
 
 export type AsymmetricKeyType = 'rsa' | 'rsa-pss' | 'dsa' | 'ec' | undefined;
@@ -395,7 +395,7 @@ function prepareAsymmetricKey(
   format: KFormatType;
   data: ArrayBuffer;
   type?: KeyEncoding;
-  passphrase?: string | ArrayBuffer;
+  passphrase?: BinaryLike;
 } {
   // TODO(osp) check, KeyObject some node object
   // if (isKeyObject(key)) {