@aws-crypto/material-management - npm Package Compare versions

Comparing version 0.2.0-preview.2 to 0.2.0-preview.3

build/main/cryptographic_material.d.ts

@@ -1,2 +0,2 @@
-import { MixedBackendCryptoKey, SupportedAlgorithmSuites, AwsEsdkJsCryptoKey, AwsEsdkJsKeyUsage } from './types';
+import { MixedBackendCryptoKey, SupportedAlgorithmSuites, AwsEsdkJsCryptoKey, AwsEsdkJsKeyUsage, EncryptionContext } from './types';
 import { EncryptedDataKey } from './encrypted_data_key';
@@ -18,2 +18,3 @@ import { SignatureKey, VerificationKey } from './signature_key';
     keyringTrace: KeyringTrace[];
+    encryptionContext: Readonly<EncryptionContext>;
 }
@@ -48,3 +49,4 @@ export interface EncryptionMaterial<T extends CryptographicMaterial<T>> extends CryptographicMaterial<T> {
     signatureKey?: SignatureKey;
-    constructor(suite: NodeAlgorithmSuite);
+    encryptionContext: Readonly<EncryptionContext>;
+    constructor(suite: NodeAlgorithmSuite, encryptionContext: EncryptionContext);
     hasValidKey(): boolean;
@@ -62,3 +64,4 @@ }
     verificationKey?: VerificationKey;
-    constructor(suite: NodeAlgorithmSuite);
+    encryptionContext: Readonly<EncryptionContext>;
+    constructor(suite: NodeAlgorithmSuite, encryptionContext: EncryptionContext);
     hasValidKey(): boolean;
@@ -82,3 +85,4 @@ }
     validUsages: ReadonlyArray<AwsEsdkJsKeyUsage>;
-    constructor(suite: WebCryptoAlgorithmSuite);
+    encryptionContext: Readonly<EncryptionContext>;
+    constructor(suite: WebCryptoAlgorithmSuite, encryptionContext: EncryptionContext);
     hasValidKey(): boolean;
@@ -100,3 +104,4 @@ }
     validUsages: ReadonlyArray<AwsEsdkJsKeyUsage>;
-    constructor(suite: WebCryptoAlgorithmSuite);
+    encryptionContext: Readonly<EncryptionContext>;
+    constructor(suite: WebCryptoAlgorithmSuite, encryptionContext: EncryptionContext);
     hasValidKey(): boolean;
@@ -103,0 +108,0 @@ }

build/main/cryptographic_material.js

@@ -24,2 +24,18 @@ "use strict";
 const needs_1 = require("./needs");
+/*
+ * This public interface to the CryptographicMaterial object is provided for
+ * developers of CMMs and keyrings only. If you are a user of the AWS Encryption
+ * SDK and you are not developing your own CMMs and/or keyrings, you do not
+ * need to use it and you should not do so.
+ *
+ * The CryptographicMaterial's purpose is to bind together all the required elements for
+ * encrypting or decrypting a payload.
+ * The functional data key (unencrypted or CryptoKey) is the most sensitive data and needs to
+ * be protected.  The longer this data persists in memory the
+ * greater the opportunity to be invalidated.  Because
+ * a Caching CMM exists it is important to ensure that the
+ * unencrypted data key and its meta data can not be manipulated,
+ * and that the unencrypted data key can be zeroed when
+ * it is no longer needed.
+ */
 let timingSafeEqual;
@@ -45,3 +61,3 @@ try {
     eval(''); // eslint-disable-line no-eval
-    /* Check for early return (Postcondition): Size is well-know information
+    /* Check for early return (Postcondition) UNTESTED: Size is well-know information.
      * and does not leak information about contents.
@@ -58,3 +74,3 @@ */
 class NodeEncryptionMaterial {
-    constructor(suite) {
+    constructor(suite, encryptionContext) {
         this.keyringTrace = [];
@@ -64,2 +80,5 @@ /* Precondition: NodeEncryptionMaterial suite must be NodeAlgorithmSuite. */
         this.suite = suite;
+        /* Precondition: NodeEncryptionMaterial encryptionContext must be an object, even if it is empty. */
+        needs_1.needs(encryptionContext && typeof encryptionContext === 'object', 'Encryption context must be set');
+        this.encryptionContext = Object.freeze({ ...encryptionContext });
         // EncryptionMaterial have generated a data key on setUnencryptedDataKey
@@ -79,3 +98,3 @@ const setFlags = keyring_trace_1.KeyringTraceFlag.WRAPPING_KEY_GENERATED_DATA_KEY;
 class NodeDecryptionMaterial {
-    constructor(suite) {
+    constructor(suite, encryptionContext) {
         this.keyringTrace = [];
@@ -85,2 +104,5 @@ /* Precondition: NodeDecryptionMaterial suite must be NodeAlgorithmSuite. */
         this.suite = suite;
+        /* Precondition: NodeDecryptionMaterial encryptionContext must be an object, even if it is empty. */
+        needs_1.needs(encryptionContext && typeof encryptionContext === 'object', 'Encryption context must be set');
+        this.encryptionContext = Object.freeze({ ...encryptionContext });
         // DecryptionMaterial have decrypted a data key on setUnencryptedDataKey
@@ -100,3 +122,3 @@ const setFlags = keyring_trace_1.KeyringTraceFlag.WRAPPING_KEY_DECRYPTED_DATA_KEY;
 class WebCryptoEncryptionMaterial {
-    constructor(suite) {
+    constructor(suite, encryptionContext) {
         this.keyringTrace = [];
@@ -107,2 +129,5 @@ /* Precondition: WebCryptoEncryptionMaterial suite must be WebCryptoAlgorithmSuite. */
         this.validUsages = Object.freeze(['deriveKey', 'encrypt']);
+        /* Precondition: WebCryptoEncryptionMaterial encryptionContext must be an object, even if it is empty. */
+        needs_1.needs(encryptionContext && typeof encryptionContext === 'object', 'Encryption context must be set');
+        this.encryptionContext = Object.freeze({ ...encryptionContext });
         // EncryptionMaterial have generated a data key on setUnencryptedDataKey
@@ -123,3 +148,3 @@ const setFlag = keyring_trace_1.KeyringTraceFlag.WRAPPING_KEY_GENERATED_DATA_KEY;
 class WebCryptoDecryptionMaterial {
-    constructor(suite) {
+    constructor(suite, encryptionContext) {
         this.keyringTrace = [];
@@ -130,2 +155,5 @@ /* Precondition: WebCryptoDecryptionMaterial suite must be WebCryptoAlgorithmSuite. */
         this.validUsages = Object.freeze(['deriveKey', 'decrypt']);
+        /* Precondition: WebCryptoDecryptionMaterial encryptionContext must be an object, even if it is empty. */
+        needs_1.needs(encryptionContext && typeof encryptionContext === 'object', 'Encryption context must be set');
+        this.encryptionContext = Object.freeze({ ...encryptionContext });
         // DecryptionMaterial have decrypted a data key on setUnencryptedDataKey
@@ -224,4 +252,5 @@ const setFlag = keyring_trace_1.KeyringTraceFlag.WRAPPING_KEY_DECRYPTED_DATA_KEY;
         unencryptedDataKeyZeroed = true;
-        /* Postcondition: Both unencryptedDataKey and udkForVerification must be either set or unset.
+        /* Postcondition UNTESTED: Both unencryptedDataKey and udkForVerification must be either set or unset.
          * If it is ever the case that only one was unset, then something is wrong in a profound way.
+         * It is not clear how this could ever happen, unless someone is manipulating the OS...
          */
@@ -370,3 +399,3 @@ needs_1.needs(unsetCount === 0 || unsetCount === 2, 'Either unencryptedDataKey or udkForVerification was not set.');
             needs_1.needs(trace && trace.keyName && trace.keyNamespace, 'Malformed KeyringTrace');
-            /* Precondition: On set the required KeyringTraceFlag must be set. */
+            /* Precondition: On setting the CryptoKey the required KeyringTraceFlag must be set. */
             needs_1.needs(trace.flags & setFlags, 'Required KeyringTraceFlag not set');
@@ -463,2 +492,2 @@ /* If I a setting a cryptoKey without an unencrypted data key,
 exports.subtleFunctionForMaterial = subtleFunctionForMaterial;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cryptographic_material.js","sourceRoot":"","sources":["../../src/cryptographic_material.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cryptographic_material.js","sourceRoot":"","sources":["../../src/cryptographic_material.ts"],"names":[],"mappings":"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"}

build/main/keyring.d.ts

 import { EncryptedDataKey } from './encrypted_data_key';
-import { EncryptionContext, EncryptionMaterial, DecryptionMaterial, SupportedAlgorithmSuites } from './types';
+import { EncryptionMaterial, DecryptionMaterial, SupportedAlgorithmSuites } from './types';
 import { NodeAlgorithmSuite } from './node_algorithms';
 import { WebCryptoAlgorithmSuite } from './web_crypto_algorithms';
 export declare abstract class Keyring<S extends SupportedAlgorithmSuites> {
-    onEncrypt(material: EncryptionMaterial<S>, context?: EncryptionContext): Promise<EncryptionMaterial<S>>;
-    abstract _onEncrypt(material: EncryptionMaterial<S>, context?: EncryptionContext): Promise<EncryptionMaterial<S>>;
-    onDecrypt(material: DecryptionMaterial<S>, encryptedDataKeys: EncryptedDataKey[], context?: EncryptionContext): Promise<DecryptionMaterial<S>>;
-    abstract _onDecrypt(material: DecryptionMaterial<S>, encryptedDataKeys: EncryptedDataKey[], context?: EncryptionContext): Promise<DecryptionMaterial<S>>;
+    onEncrypt(material: EncryptionMaterial<S>): Promise<EncryptionMaterial<S>>;
+    abstract _onEncrypt(material: EncryptionMaterial<S>): Promise<EncryptionMaterial<S>>;
+    onDecrypt(material: DecryptionMaterial<S>, encryptedDataKeys: EncryptedDataKey[]): Promise<DecryptionMaterial<S>>;
+    abstract _onDecrypt(material: DecryptionMaterial<S>, encryptedDataKeys: EncryptedDataKey[]): Promise<DecryptionMaterial<S>>;
 }
@@ -11,0 +11,0 @@ export declare abstract class KeyringNode extends Keyring<NodeAlgorithmSuite> {

build/main/keyring.js

@@ -28,5 +28,5 @@ "use strict";
 class Keyring {
-    async onEncrypt(material, context) {
+    async onEncrypt(material) {
         /* Precondition: material must be a type of isEncryptionMaterial.
-         * There are several security properties that NodeEncryptionMaterial and WebCryptoEncrypionMaterial
+         * There are several security properties that NodeEncryptionMaterial and WebCryptoEncryptionMaterial
          * posses.
@@ -38,3 +38,3 @@ * The unencryptedDataKey can only be written once.
         needs_1.needs(cryptographic_material_1.isEncryptionMaterial(material), 'Unsupported type of material.');
-        const _material = await this._onEncrypt(material, context);
+        const _material = await this._onEncrypt(material);
         /* Postcondition: The EncryptionMaterial objects must be the same.
@@ -47,3 +47,3 @@ * See cryptographic_materials.ts.  The CryptographicMaterial objects
         needs_1.needs(material === _material, 'New EncryptionMaterial instances can not be created.');
-        /* Postcondition: If this keyring generated data key, it must be the right length.
+        /* Postcondition UNTESTED: If this keyring generated data key, it must be the right length.
          * See cryptographic_materials.ts This is handled in setUnencryptedDataKey
@@ -65,3 +65,3 @@ * this condition is listed here to keep help keep track of important conditions
      */
-    async onDecrypt(material, encryptedDataKeys, context) {
+    async onDecrypt(material, encryptedDataKeys) {
         /* Precondition: material must be DecryptionMaterial. */
@@ -74,3 +74,3 @@ needs_1.needs(cryptographic_material_1.isDecryptionMaterial(material), 'Unsupported material type.');
         needs_1.needs(encryptedDataKeys.every(edk => edk instanceof encrypted_data_key_1.EncryptedDataKey), 'Unsupported EncryptedDataKey type');
-        const _material = await this._onDecrypt(material, encryptedDataKeys, context);
+        const _material = await this._onDecrypt(material, encryptedDataKeys);
         /* Postcondition: The DecryptionMaterial objects must be the same.
@@ -102,2 +102,2 @@ * See cryptographic_materials.ts.  The CryptographicMaterial objects
 immutable_class_1.immutableClass(KeyringWebCrypto);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5cmluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXlyaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7OztHQWFHOztBQUVILDZEQUF1RDtBQUN2RCx1REFBc0U7QUFFdEUscUVBQXFGO0FBRXJGLG1DQUErQjtBQUkvQjs7Ozs7R0FLRztBQUVILE1BQXNCLE9BQU87SUFDM0IsS0FBSyxDQUFDLFNBQVMsQ0FBRSxRQUErQixFQUFFLE9BQTJCO1FBQzNFOzs7Ozs7V0FNRztRQUNILGFBQUssQ0FBQyw2Q0FBb0IsQ0FBQyxRQUFRLENBQUMsRUFBRSwrQkFBK0IsQ0FBQyxDQUFBO1FBRXRFLE1BQU0sU0FBUyxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLEVBQUUsT0FBTyxDQUFDLENBQUE7UUFFMUQ7Ozs7O1dBS0c7UUFDSCxhQUFLLENBQUMsUUFBUSxLQUFLLFNBQVMsRUFBRSxzREFBc0QsQ0FBQyxDQUFBO1FBRXJGOzs7VUFHRTtRQUVGLE9BQU8sUUFBUSxDQUFBO0lBQ2pCLENBQUM7SUFJRDs7Ozs7Ozs7OztPQVVHO0lBQ0gsS0FBSyxDQUFDLFNBQVMsQ0FBRSxRQUErQixFQUFFLGlCQUFxQyxFQUFFLE9BQTJCO1FBQ2xILHdEQUF3RDtRQUN4RCxhQUFLLENBQUMsNkNBQW9CLENBQUMsUUFBUSxDQUFDLEVBQUUsNEJBQTRCLENBQUMsQ0FBQTtRQUVuRSwwRkFBMEY7UUFDMUYsSUFBSSxRQUFRLENBQUMsV0FBVyxFQUFFO1lBQUUsT0FBTyxRQUFRLENBQUE7UUFFM0MsbUVBQW1FO1FBQ25FLGFBQUssQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLFlBQVkscUNBQWdCLENBQUMsRUFBRSxtQ0FBbUMsQ0FBQyxDQUFBO1FBRTNHLE1BQU0sU0FBUyxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLEVBQUUsaUJBQWlCLEVBQUUsT0FBTyxDQUFDLENBQUE7UUFFN0U7Ozs7O1dBS0c7UUFDSCxhQUFLLENBQUMsUUFBUSxLQUFLLFNBQVMsRUFBRSxzREFBc0QsQ0FBQyxDQUFBO1FBRXJGOzs7OztXQUtHO1FBRUgsT0FBTyxRQUFRLENBQUE7SUFDakIsQ0FBQztDQUdGO0FBekVELDBCQXlFQztBQUVELG9DQUFrQixDQUFDLE9BQU8sQ0FBQyxDQUFBO0FBRTNCLE1BQXNCLFdBQVksU0FBUSxPQUEyQjtDQUFHO0FBQXhFLGtDQUF3RTtBQUN4RSxnQ0FBYyxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBQzNCLE1BQXNCLGdCQUFpQixTQUFRLE9BQWdDO0NBQUc7QUFBbEYsNENBQWtGO0FBQ2xGLGdDQUFjLENBQUMsZ0JBQWdCLENBQUMsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5cmluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXlyaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7OztHQWFHOztBQUVILDZEQUF1RDtBQUN2RCx1REFBc0U7QUFFdEUscUVBQXFGO0FBRXJGLG1DQUErQjtBQUkvQjs7Ozs7R0FLRztBQUVILE1BQXNCLE9BQU87SUFDM0IsS0FBSyxDQUFDLFNBQVMsQ0FBRSxRQUErQjtRQUM5Qzs7Ozs7O1dBTUc7UUFDSCxhQUFLLENBQUMsNkNBQW9CLENBQUMsUUFBUSxDQUFDLEVBQUUsK0JBQStCLENBQUMsQ0FBQTtRQUV0RSxNQUFNLFNBQVMsR0FBRyxNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUE7UUFFakQ7Ozs7O1dBS0c7UUFDSCxhQUFLLENBQUMsUUFBUSxLQUFLLFNBQVMsRUFBRSxzREFBc0QsQ0FBQyxDQUFBO1FBRXJGOzs7VUFHRTtRQUVGLE9BQU8sUUFBUSxDQUFBO0lBQ2pCLENBQUM7SUFJRDs7Ozs7Ozs7OztPQVVHO0lBQ0gsS0FBSyxDQUFDLFNBQVMsQ0FBRSxRQUErQixFQUFFLGlCQUFxQztRQUNyRix3REFBd0Q7UUFDeEQsYUFBSyxDQUFDLDZDQUFvQixDQUFDLFFBQVEsQ0FBQyxFQUFFLDRCQUE0QixDQUFDLENBQUE7UUFFbkUsMEZBQTBGO1FBQzFGLElBQUksUUFBUSxDQUFDLFdBQVcsRUFBRTtZQUFFLE9BQU8sUUFBUSxDQUFBO1FBRTNDLG1FQUFtRTtRQUNuRSxhQUFLLENBQUMsaUJBQWlCLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxZQUFZLHFDQUFnQixDQUFDLEVBQUUsbUNBQW1DLENBQUMsQ0FBQTtRQUUzRyxNQUFNLFNBQVMsR0FBRyxNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFLGlCQUFpQixDQUFDLENBQUE7UUFFcEU7Ozs7O1dBS0c7UUFDSCxhQUFLLENBQUMsUUFBUSxLQUFLLFNBQVMsRUFBRSxzREFBc0QsQ0FBQyxDQUFBO1FBRXJGOzs7OztXQUtHO1FBRUgsT0FBTyxRQUFRLENBQUE7SUFDakIsQ0FBQztDQUdGO0FBekVELDBCQXlFQztBQUVELG9DQUFrQixDQUFDLE9BQU8sQ0FBQyxDQUFBO0FBRTNCLE1BQXNCLFdBQVksU0FBUSxPQUEyQjtDQUFHO0FBQXhFLGtDQUF3RTtBQUN4RSxnQ0FBYyxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBQzNCLE1BQXNCLGdCQUFpQixTQUFRLE9BQWdDO0NBQUc7QUFBbEYsNENBQWtGO0FBQ2xGLGdDQUFjLENBQUMsZ0JBQWdCLENBQUMsQ0FBQSJ9

build/main/materials_manager.d.ts

 import { EncryptionRequest, DecryptionRequest } from '.';
-import { EncryptionResponse, DecryptionResponse, SupportedAlgorithmSuites } from './types';
+import { EncryptionMaterial, DecryptionMaterial, SupportedAlgorithmSuites } from './types';
 import { NodeAlgorithmSuite } from './node_algorithms';
 import { WebCryptoAlgorithmSuite } from './web_crypto_algorithms';
 export interface GetEncryptionMaterials<S extends SupportedAlgorithmSuites> {
-    (request: EncryptionRequest<S>): Promise<EncryptionResponse<S>>;
+    (request: EncryptionRequest<S>): Promise<EncryptionMaterial<S>>;
 }
 export interface GetDecryptMaterials<S extends SupportedAlgorithmSuites> {
-    (request: DecryptionRequest<S>): Promise<DecryptionResponse<S>>;
+    (request: DecryptionRequest<S>): Promise<DecryptionMaterial<S>>;
 }
@@ -11,0 +11,0 @@ export interface MaterialsManager<S extends SupportedAlgorithmSuites> {

build/main/multi_keyring.d.ts

 import { Keyring, // eslint-disable-line no-unused-vars
 KeyringNode, KeyringWebCrypto } from './keyring';
-import { EncryptionContext, SupportedAlgorithmSuites } from './types';
+import { SupportedAlgorithmSuites } from './types';
 import { EncryptedDataKey } from './encrypted_data_key';
@@ -11,4 +11,4 @@ import { NodeAlgorithmSuite } from './node_algorithms';
     constructor(input: MultiKeyringInput<NodeAlgorithmSuite>);
-    _onEncrypt: (this: IMultiKeyring<NodeAlgorithmSuite>, material: import("./cryptographic_material").NodeEncryptionMaterial, context?: EncryptionContext | undefined) => Promise<import("./cryptographic_material").NodeEncryptionMaterial>;
-    _onDecrypt: (this: IMultiKeyring<NodeAlgorithmSuite>, material: import("./cryptographic_material").NodeDecryptionMaterial, encryptedDataKeys: EncryptedDataKey[], context?: EncryptionContext | undefined) => Promise<import("./cryptographic_material").NodeDecryptionMaterial>;
+    _onEncrypt: (this: IMultiKeyring<NodeAlgorithmSuite>, material: import("./cryptographic_material").NodeEncryptionMaterial) => Promise<import("./cryptographic_material").NodeEncryptionMaterial>;
+    _onDecrypt: (this: IMultiKeyring<NodeAlgorithmSuite>, material: import("./cryptographic_material").NodeDecryptionMaterial, encryptedDataKeys: EncryptedDataKey[]) => Promise<import("./cryptographic_material").NodeDecryptionMaterial>;
 }
@@ -19,4 +19,4 @@ export declare class MultiKeyringWebCrypto extends KeyringWebCrypto implements IMultiKeyring<WebCryptoAlgorithmSuite> {
     constructor(input: MultiKeyringInput<WebCryptoAlgorithmSuite>);
-    _onEncrypt: (this: IMultiKeyring<WebCryptoAlgorithmSuite>, material: import("./cryptographic_material").WebCryptoEncryptionMaterial, context?: EncryptionContext | undefined) => Promise<import("./cryptographic_material").WebCryptoEncryptionMaterial>;
-    _onDecrypt: (this: IMultiKeyring<WebCryptoAlgorithmSuite>, material: import("./cryptographic_material").WebCryptoDecryptionMaterial, encryptedDataKeys: EncryptedDataKey[], context?: EncryptionContext | undefined) => Promise<import("./cryptographic_material").WebCryptoDecryptionMaterial>;
+    _onEncrypt: (this: IMultiKeyring<WebCryptoAlgorithmSuite>, material: import("./cryptographic_material").WebCryptoEncryptionMaterial) => Promise<import("./cryptographic_material").WebCryptoEncryptionMaterial>;
+    _onDecrypt: (this: IMultiKeyring<WebCryptoAlgorithmSuite>, material: import("./cryptographic_material").WebCryptoDecryptionMaterial, encryptedDataKeys: EncryptedDataKey[]) => Promise<import("./cryptographic_material").WebCryptoDecryptionMaterial>;
 }
@@ -23,0 +23,0 @@ interface MultiKeyringInput<S extends SupportedAlgorithmSuites> {

build/main/multi_keyring.js

@@ -51,18 +51,24 @@ "use strict";
 function buildPrivateOnEncrypt() {
-    return async function _onEncrypt(material, context) {
+    return async function _onEncrypt(material) {
+        /* Precondition: Only Keyrings explicitly designated as generators can generate material.
+         * Technically, the precondition below will handle this.
+         * Since if I do not have an unencrypted data key,
+         * and I do not have a generator,
+         * then generated.hasUnencryptedDataKey === false will throw.
+         * But this is a much more meaningful error.
+         */
+        needs_1.needs(!material.hasUnencryptedDataKey ? this.generator : true, 'Only Keyrings explicitly designated as generators can generate material.');
         const generated = this.generator
-            ? await this.generator.onEncrypt(material, context)
+            ? await this.generator.onEncrypt(material)
             : material;
         /* Precondition: A Generator Keyring *must* ensure generated material. */
-        needs_1.needs(this.generator && generated.hasUnencryptedDataKey, 'Generator Keyring has not generated material.');
-        /* Precondition: Only Keyrings explicitly designated as generators can generate material. */
-        needs_1.needs(generated.hasUnencryptedDataKey, 'Only Keyrings explicitly designated as generators can generate material.');
+        needs_1.needs(generated.hasUnencryptedDataKey, 'Generator Keyring has not generated material.');
         /* By default this is a serial operation.  A keyring _may_ perform an expensive operation
-      * or create resource constraints such that encrypting with multiple keyrings could
-      * fail in unexpected ways.
-      * Additionally, "downstream" keyrings may make choices about the EncryptedDataKeys they
-      * append based on already appended EDK's.
-      */
+         * or create resource constraints such that encrypting with multiple keyrings could
+         * fail in unexpected ways.
+         * Additionally, "downstream" keyrings may make choices about the EncryptedDataKeys they
+         * append based on already appended EDK's.
+         */
         for (const keyring of this.children) {
-            await keyring.onEncrypt(generated, context);
+            await keyring.onEncrypt(generated);
         }
@@ -76,3 +82,3 @@ // Keyrings are required to not create new EncryptionMaterial instances, but
 function buildPrivateOnDecrypt() {
-    return async function _onDecrypt(material, encryptedDataKeys, context) {
+    return async function _onDecrypt(material, encryptedDataKeys) {
         const children = this.children.slice();
@@ -86,3 +92,3 @@ if (this.generator)
             try {
-                await keyring.onDecrypt(material, encryptedDataKeys, context);
+                await keyring.onDecrypt(material, encryptedDataKeys);
             }
@@ -99,2 +105,2 @@ catch (e) {
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXVsdGlfa2V5cmluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tdWx0aV9rZXlyaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7OztHQWFHOztBQUVILHVEQUFvRTtBQUNwRSx1Q0FJa0I7QUFFbEIsbUNBQStCO0FBSy9CLE1BQWEsZ0JBQWlCLFNBQVEscUJBQVc7SUFHL0MsWUFBYSxLQUE0QztRQUN2RCxLQUFLLEVBQUUsQ0FBQTtRQUdULGVBQVUsR0FBRyxxQkFBcUIsRUFBc0IsQ0FBQTtRQUN4RCxlQUFVLEdBQUcscUJBQXFCLEVBQXNCLENBQUE7UUFIdEQsa0JBQWtCLENBQUMsSUFBSSxFQUFFLHFCQUFXLEVBQUUsS0FBSyxDQUFDLENBQUE7SUFDOUMsQ0FBQztDQUdGO0FBVEQsNENBU0M7QUFDRCxnQ0FBYyxDQUFDLGdCQUFnQixDQUFDLENBQUE7QUFFaEMsTUFBYSxxQkFBc0IsU0FBUSwwQkFBZ0I7SUFJekQsWUFBYSxLQUFpRDtRQUM1RCxLQUFLLEVBQUUsQ0FBQTtRQUdULGVBQVUsR0FBRyxxQkFBcUIsRUFBMkIsQ0FBQTtRQUM3RCxlQUFVLEdBQUcscUJBQXFCLEVBQTJCLENBQUE7UUFIM0Qsa0JBQWtCLENBQUMsSUFBSSxFQUFFLDBCQUFnQixFQUFFLEtBQUssQ0FBQyxDQUFBO0lBQ25ELENBQUM7Q0FHRjtBQVZELHNEQVVDO0FBQ0QsZ0NBQWMsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFBO0FBRXJDLFNBQVMsa0JBQWtCLENBQ3pCLEdBQXFCLEVBQ3JCLFdBQWdCLEVBQ2hCLEVBQUUsU0FBUyxFQUFFLFFBQVEsR0FBRyxFQUFFLEVBQXdCO0lBRWxELG9EQUFvRDtJQUNwRCxhQUFLLENBQUMsU0FBUyxJQUFJLFFBQVEsQ0FBQyxNQUFNLEVBQUUscUNBQXFDLENBQUMsQ0FBQTtJQUMxRSxnREFBZ0Q7SUFDaEQsYUFBSyxDQUFDLENBQUMsQ0FBQyxTQUFTLEtBQUssU0FBUyxZQUFZLFdBQVcsRUFBRSw2QkFBNkIsQ0FBQyxDQUFBO0lBQ3RGLGtEQUFrRDtJQUNsRCxhQUFLLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsWUFBWSxXQUFXLENBQUMsRUFBRSx5QkFBeUIsQ0FBQyxDQUFBO0lBRWpGLGtDQUFnQixDQUFDLEdBQUcsRUFBRSxVQUFVLEVBQUUsTUFBTSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFBO0lBQ2xFLGtDQUFnQixDQUFDLEdBQUcsRUFBRSxXQUFXLEVBQUUsU0FBUyxDQUFDLENBQUE7QUFDL0MsQ0FBQztBQUVELFNBQVMscUJBQXFCO0lBQzVCLE9BQU8sS0FBSyxVQUFVLFVBQVUsQ0FFOUIsUUFBK0IsRUFBRSxPQUEyQjtRQUU1RCxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsU0FBUztZQUM5QixDQUFDLENBQUMsTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxRQUFRLEVBQUUsT0FBTyxDQUFDO1lBQ25ELENBQUMsQ0FBQyxRQUFRLENBQUE7UUFFWix5RUFBeUU7UUFDekUsYUFBSyxDQUFDLElBQUksQ0FBQyxTQUFTLElBQUksU0FBUyxDQUFDLHFCQUFxQixFQUFFLCtDQUErQyxDQUFDLENBQUE7UUFDekcsNEZBQTRGO1FBQzVGLGFBQUssQ0FBQyxTQUFTLENBQUMscUJBQXFCLEVBQUUsMEVBQTBFLENBQUMsQ0FBQTtRQUVsSDs7Ozs7UUFLQTtRQUNBLEtBQUssTUFBTSxPQUFPLElBQUksSUFBSSxDQUFDLFFBQVEsRUFBRTtZQUNuQyxNQUFNLE9BQU8sQ0FBQyxTQUFTLENBQUMsU0FBUyxFQUFFLE9BQU8sQ0FBQyxDQUFBO1NBQzVDO1FBRUQsNEVBQTRFO1FBQzVFLDBFQUEwRTtRQUMxRSxtQkFBbUI7UUFDbkIsT0FBTyxTQUFTLENBQUE7SUFDbEIsQ0FBQyxDQUFBO0FBQ0gsQ0FBQztBQUVELFNBQVMscUJBQXFCO0lBQzVCLE9BQU8sS0FBSyxVQUFVLFVBQVUsQ0FFOUIsUUFBK0IsRUFDL0IsaUJBQXFDLEVBQ3JDLE9BQTJCO1FBRTNCLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDdEMsSUFBSSxJQUFJLENBQUMsU0FBUztZQUFFLFFBQVEsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFBO1FBRXBELEtBQUssTUFBTSxPQUFPLElBQUksUUFBUSxFQUFFO1lBQ2hDLGdHQUFnRztZQUM5RixJQUFJLFFBQVEsQ0FBQyxXQUFXLEVBQUU7Z0JBQUUsT0FBTyxRQUFRLENBQUE7WUFFM0MsSUFBSTtnQkFDRixNQUFNLE9BQU8sQ0FBQyxTQUFTLENBQUMsUUFBUSxFQUFFLGlCQUFpQixFQUFFLE9BQU8sQ0FBQyxDQUFBO2FBQzlEO1lBQUMsT0FBTyxDQUFDLEVBQUU7Z0JBQ1osNkNBQTZDO2dCQUM3QywwREFBMEQ7Z0JBQzFELDBEQUEwRDtnQkFDMUQsMkJBQTJCO2FBQzFCO1NBQ0Y7UUFDRCxPQUFPLFFBQVEsQ0FBQTtJQUNqQixDQUFDLENBQUE7QUFDSCxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXVsdGlfa2V5cmluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tdWx0aV9rZXlyaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7OztHQWFHOztBQUVILHVEQUFvRTtBQUNwRSx1Q0FJa0I7QUFFbEIsbUNBQStCO0FBSy9CLE1BQWEsZ0JBQWlCLFNBQVEscUJBQVc7SUFHL0MsWUFBYSxLQUE0QztRQUN2RCxLQUFLLEVBQUUsQ0FBQTtRQUdULGVBQVUsR0FBRyxxQkFBcUIsRUFBc0IsQ0FBQTtRQUN4RCxlQUFVLEdBQUcscUJBQXFCLEVBQXNCLENBQUE7UUFIdEQsa0JBQWtCLENBQUMsSUFBSSxFQUFFLHFCQUFXLEVBQUUsS0FBSyxDQUFDLENBQUE7SUFDOUMsQ0FBQztDQUdGO0FBVEQsNENBU0M7QUFDRCxnQ0FBYyxDQUFDLGdCQUFnQixDQUFDLENBQUE7QUFFaEMsTUFBYSxxQkFBc0IsU0FBUSwwQkFBZ0I7SUFJekQsWUFBYSxLQUFpRDtRQUM1RCxLQUFLLEVBQUUsQ0FBQTtRQUdULGVBQVUsR0FBRyxxQkFBcUIsRUFBMkIsQ0FBQTtRQUM3RCxlQUFVLEdBQUcscUJBQXFCLEVBQTJCLENBQUE7UUFIM0Qsa0JBQWtCLENBQUMsSUFBSSxFQUFFLDBCQUFnQixFQUFFLEtBQUssQ0FBQyxDQUFBO0lBQ25ELENBQUM7Q0FHRjtBQVZELHNEQVVDO0FBQ0QsZ0NBQWMsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFBO0FBRXJDLFNBQVMsa0JBQWtCLENBQ3pCLEdBQXFCLEVBQ3JCLFdBQWdCLEVBQ2hCLEVBQUUsU0FBUyxFQUFFLFFBQVEsR0FBRyxFQUFFLEVBQXdCO0lBRWxELG9EQUFvRDtJQUNwRCxhQUFLLENBQUMsU0FBUyxJQUFJLFFBQVEsQ0FBQyxNQUFNLEVBQUUscUNBQXFDLENBQUMsQ0FBQTtJQUMxRSxnREFBZ0Q7SUFDaEQsYUFBSyxDQUFDLENBQUMsQ0FBQyxTQUFTLEtBQUssU0FBUyxZQUFZLFdBQVcsRUFBRSw2QkFBNkIsQ0FBQyxDQUFBO0lBQ3RGLGtEQUFrRDtJQUNsRCxhQUFLLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsWUFBWSxXQUFXLENBQUMsRUFBRSx5QkFBeUIsQ0FBQyxDQUFBO0lBRWpGLGtDQUFnQixDQUFDLEdBQUcsRUFBRSxVQUFVLEVBQUUsTUFBTSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFBO0lBQ2xFLGtDQUFnQixDQUFDLEdBQUcsRUFBRSxXQUFXLEVBQUUsU0FBUyxDQUFDLENBQUE7QUFDL0MsQ0FBQztBQUVELFNBQVMscUJBQXFCO0lBQzVCLE9BQU8sS0FBSyxVQUFVLFVBQVUsQ0FFOUIsUUFBK0I7UUFFL0I7Ozs7OztXQU1HO1FBQ0gsYUFBSyxDQUFDLENBQUMsUUFBUSxDQUFDLHFCQUFxQixDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsMEVBQTBFLENBQUMsQ0FBQTtRQUUxSSxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsU0FBUztZQUM5QixDQUFDLENBQUMsTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUM7WUFDMUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQTtRQUVaLHlFQUF5RTtRQUN6RSxhQUFLLENBQUMsU0FBUyxDQUFDLHFCQUFxQixFQUFFLCtDQUErQyxDQUFDLENBQUE7UUFFdkY7Ozs7O1dBS0c7UUFDSCxLQUFLLE1BQU0sT0FBTyxJQUFJLElBQUksQ0FBQyxRQUFRLEVBQUU7WUFDbkMsTUFBTSxPQUFPLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFBO1NBQ25DO1FBRUQsNEVBQTRFO1FBQzVFLDBFQUEwRTtRQUMxRSxtQkFBbUI7UUFDbkIsT0FBTyxTQUFTLENBQUE7SUFDbEIsQ0FBQyxDQUFBO0FBQ0gsQ0FBQztBQUVELFNBQVMscUJBQXFCO0lBQzVCLE9BQU8sS0FBSyxVQUFVLFVBQVUsQ0FFOUIsUUFBK0IsRUFDL0IsaUJBQXFDO1FBRXJDLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDdEMsSUFBSSxJQUFJLENBQUMsU0FBUztZQUFFLFFBQVEsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFBO1FBRXBELEtBQUssTUFBTSxPQUFPLElBQUksUUFBUSxFQUFFO1lBQ2hDLGdHQUFnRztZQUM5RixJQUFJLFFBQVEsQ0FBQyxXQUFXLEVBQUU7Z0JBQUUsT0FBTyxRQUFRLENBQUE7WUFFM0MsSUFBSTtnQkFDRixNQUFNLE9BQU8sQ0FBQyxTQUFTLENBQUMsUUFBUSxFQUFFLGlCQUFpQixDQUFDLENBQUE7YUFDckQ7WUFBQyxPQUFPLENBQUMsRUFBRTtnQkFDWiw2Q0FBNkM7Z0JBQzdDLDBEQUEwRDtnQkFDMUQsMERBQTBEO2dCQUMxRCwyQkFBMkI7YUFDMUI7U0FDRjtRQUNELE9BQU8sUUFBUSxDQUFBO0lBQ2pCLENBQUMsQ0FBQTtBQUNILENBQUMifQ==

build/main/types.d.ts

@@ -26,19 +26,10 @@ import { NodeAlgorithmSuite } from './node_algorithms';
     readonly suite?: S;
-    readonly encryptionContext?: EncryptionContext;
-    readonly frameLength?: number;
+    readonly encryptionContext: EncryptionContext;
     readonly plaintextLength?: number;
 }
-export interface EncryptionResponse<S extends NodeAlgorithmSuite | WebCryptoAlgorithmSuite> {
-    material: EncryptionMaterial<S>;
-    context: EncryptionContext;
-}
 export interface DecryptionRequest<S extends NodeAlgorithmSuite | WebCryptoAlgorithmSuite> {
     readonly suite: S;
-    readonly encryptionContext?: EncryptionContext;
+    readonly encryptionContext: EncryptionContext;
     readonly encryptedDataKeys: ReadonlyArray<EncryptedDataKey>;
 }
-export interface DecryptionResponse<S extends NodeAlgorithmSuite | WebCryptoAlgorithmSuite> {
-    material: DecryptionMaterial<S>;
-    context: EncryptionContext;
-}
 export declare type SupportedAlgorithmSuites = NodeAlgorithmSuite | WebCryptoAlgorithmSuite;
@@ -45,0 +36,0 @@ export declare type EncryptionMaterial<Suite> = Suite extends NodeAlgorithmSuite ? NodeEncryptionMaterial : Suite extends WebCryptoAlgorithmSuite ? WebCryptoEncryptionMaterial : never;

build/module/cryptographic_material.d.ts

@@ -1,2 +0,2 @@
-import { MixedBackendCryptoKey, SupportedAlgorithmSuites, AwsEsdkJsCryptoKey, AwsEsdkJsKeyUsage } from './types';
+import { MixedBackendCryptoKey, SupportedAlgorithmSuites, AwsEsdkJsCryptoKey, AwsEsdkJsKeyUsage, EncryptionContext } from './types';
 import { EncryptedDataKey } from './encrypted_data_key';
@@ -18,2 +18,3 @@ import { SignatureKey, VerificationKey } from './signature_key';
     keyringTrace: KeyringTrace[];
+    encryptionContext: Readonly<EncryptionContext>;
 }
@@ -48,3 +49,4 @@ export interface EncryptionMaterial<T extends CryptographicMaterial<T>> extends CryptographicMaterial<T> {
     signatureKey?: SignatureKey;
-    constructor(suite: NodeAlgorithmSuite);
+    encryptionContext: Readonly<EncryptionContext>;
+    constructor(suite: NodeAlgorithmSuite, encryptionContext: EncryptionContext);
     hasValidKey(): boolean;
@@ -62,3 +64,4 @@ }
     verificationKey?: VerificationKey;
-    constructor(suite: NodeAlgorithmSuite);
+    encryptionContext: Readonly<EncryptionContext>;
+    constructor(suite: NodeAlgorithmSuite, encryptionContext: EncryptionContext);
     hasValidKey(): boolean;
@@ -82,3 +85,4 @@ }
     validUsages: ReadonlyArray<AwsEsdkJsKeyUsage>;
-    constructor(suite: WebCryptoAlgorithmSuite);
+    encryptionContext: Readonly<EncryptionContext>;
+    constructor(suite: WebCryptoAlgorithmSuite, encryptionContext: EncryptionContext);
     hasValidKey(): boolean;
@@ -100,3 +104,4 @@ }
     validUsages: ReadonlyArray<AwsEsdkJsKeyUsage>;
-    constructor(suite: WebCryptoAlgorithmSuite);
+    encryptionContext: Readonly<EncryptionContext>;
+    constructor(suite: WebCryptoAlgorithmSuite, encryptionContext: EncryptionContext);
     hasValidKey(): boolean;
@@ -103,0 +108,0 @@ }

build/module/cryptographic_material.js

@@ -22,2 +22,18 @@ /*
 import { needs } from './needs';
+/*
+ * This public interface to the CryptographicMaterial object is provided for
+ * developers of CMMs and keyrings only. If you are a user of the AWS Encryption
+ * SDK and you are not developing your own CMMs and/or keyrings, you do not
+ * need to use it and you should not do so.
+ *
+ * The CryptographicMaterial's purpose is to bind together all the required elements for
+ * encrypting or decrypting a payload.
+ * The functional data key (unencrypted or CryptoKey) is the most sensitive data and needs to
+ * be protected.  The longer this data persists in memory the
+ * greater the opportunity to be invalidated.  Because
+ * a Caching CMM exists it is important to ensure that the
+ * unencrypted data key and its meta data can not be manipulated,
+ * and that the unencrypted data key can be zeroed when
+ * it is no longer needed.
+ */
 let timingSafeEqual;
@@ -43,3 +59,3 @@ try {
     eval(''); // eslint-disable-line no-eval
-    /* Check for early return (Postcondition): Size is well-know information
+    /* Check for early return (Postcondition) UNTESTED: Size is well-know information.
      * and does not leak information about contents.
@@ -56,3 +72,3 @@ */
 export class NodeEncryptionMaterial {
-    constructor(suite) {
+    constructor(suite, encryptionContext) {
         this.keyringTrace = [];
@@ -62,2 +78,5 @@ /* Precondition: NodeEncryptionMaterial suite must be NodeAlgorithmSuite. */
         this.suite = suite;
+        /* Precondition: NodeEncryptionMaterial encryptionContext must be an object, even if it is empty. */
+        needs(encryptionContext && typeof encryptionContext === 'object', 'Encryption context must be set');
+        this.encryptionContext = Object.freeze({ ...encryptionContext });
         // EncryptionMaterial have generated a data key on setUnencryptedDataKey
@@ -76,3 +95,3 @@ const setFlags = KeyringTraceFlag.WRAPPING_KEY_GENERATED_DATA_KEY;
 export class NodeDecryptionMaterial {
-    constructor(suite) {
+    constructor(suite, encryptionContext) {
         this.keyringTrace = [];
@@ -82,2 +101,5 @@ /* Precondition: NodeDecryptionMaterial suite must be NodeAlgorithmSuite. */
         this.suite = suite;
+        /* Precondition: NodeDecryptionMaterial encryptionContext must be an object, even if it is empty. */
+        needs(encryptionContext && typeof encryptionContext === 'object', 'Encryption context must be set');
+        this.encryptionContext = Object.freeze({ ...encryptionContext });
         // DecryptionMaterial have decrypted a data key on setUnencryptedDataKey
@@ -96,3 +118,3 @@ const setFlags = KeyringTraceFlag.WRAPPING_KEY_DECRYPTED_DATA_KEY;
 export class WebCryptoEncryptionMaterial {
-    constructor(suite) {
+    constructor(suite, encryptionContext) {
         this.keyringTrace = [];
@@ -103,2 +125,5 @@ /* Precondition: WebCryptoEncryptionMaterial suite must be WebCryptoAlgorithmSuite. */
         this.validUsages = Object.freeze(['deriveKey', 'encrypt']);
+        /* Precondition: WebCryptoEncryptionMaterial encryptionContext must be an object, even if it is empty. */
+        needs(encryptionContext && typeof encryptionContext === 'object', 'Encryption context must be set');
+        this.encryptionContext = Object.freeze({ ...encryptionContext });
         // EncryptionMaterial have generated a data key on setUnencryptedDataKey
@@ -118,3 +143,3 @@ const setFlag = KeyringTraceFlag.WRAPPING_KEY_GENERATED_DATA_KEY;
 export class WebCryptoDecryptionMaterial {
-    constructor(suite) {
+    constructor(suite, encryptionContext) {
         this.keyringTrace = [];
@@ -125,2 +150,5 @@ /* Precondition: WebCryptoDecryptionMaterial suite must be WebCryptoAlgorithmSuite. */
         this.validUsages = Object.freeze(['deriveKey', 'decrypt']);
+        /* Precondition: WebCryptoDecryptionMaterial encryptionContext must be an object, even if it is empty. */
+        needs(encryptionContext && typeof encryptionContext === 'object', 'Encryption context must be set');
+        this.encryptionContext = Object.freeze({ ...encryptionContext });
         // DecryptionMaterial have decrypted a data key on setUnencryptedDataKey
@@ -216,4 +244,5 @@ const setFlag = KeyringTraceFlag.WRAPPING_KEY_DECRYPTED_DATA_KEY;
         unencryptedDataKeyZeroed = true;
-        /* Postcondition: Both unencryptedDataKey and udkForVerification must be either set or unset.
+        /* Postcondition UNTESTED: Both unencryptedDataKey and udkForVerification must be either set or unset.
          * If it is ever the case that only one was unset, then something is wrong in a profound way.
+         * It is not clear how this could ever happen, unless someone is manipulating the OS...
          */
@@ -359,3 +388,3 @@ needs(unsetCount === 0 || unsetCount === 2, 'Either unencryptedDataKey or udkForVerification was not set.');
             needs(trace && trace.keyName && trace.keyNamespace, 'Malformed KeyringTrace');
-            /* Precondition: On set the required KeyringTraceFlag must be set. */
+            /* Precondition: On setting the CryptoKey the required KeyringTraceFlag must be set. */
             needs(trace.flags & setFlags, 'Required KeyringTraceFlag not set');
@@ -447,2 +476,2 @@ /* If I a setting a cryptoKey without an unencrypted data key,
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cryptographic_material.js","sourceRoot":"","sources":["../../src/cryptographic_material.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAC/D,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACjE,OAAO,EAAgB,gBAAgB,EAAE,MAAM,iBAAiB,CAAA,CAAC,qCAAqC;AACtG,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAA;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/B,IAAI,eAA0D,CAAA;AAC9D,IAAI;IACF;;;OAGG;IACH,MAAM,EAAE,eAAe,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;IAClE,eAAe,GAAG,mBAAmB,IAAI,uBAAuB,CAAA;CACjE;AAAC,OAAO,CAAC,EAAE;IACV,eAAe,GAAG,uBAAuB,CAAA;CAC1C;AACD,sDAAsD;AACtD,SAAS,uBAAuB,CAAE,CAAa,EAAE,CAAa;IAC5D;;;;OAIG;IACH,IAAI,CAAC,EAAE,CAAC,CAAA,CAAC,8BAA8B;IACvC;;OAEG;IACH,IAAI,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,UAAU;QAAE,OAAO,KAAK,CAAA;IAE/C,IAAI,IAAI,GAAG,CAAC,CAAA;IACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACjC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;KACpB;IACD,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC,CAAA;AACrB,CAAC;AAoDD,MAAM,OAAO,sBAAsB;IAcjC,YAAa,KAAyB;QALtC,iBAAY,GAAmB,EAAE,CAAA;QAM/B,4EAA4E;QAC5E,KAAK,CAAC,KAAK,YAAY,kBAAkB,EAAE,oCAAoC,CAAC,CAAA;QAChF,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,wEAAwE;QACxE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,+BAA+B,CAAA;QACjE,6BAA6B,CAAyB,IAAI,EAAE,QAAQ,CAAC,CAAA;QACrE,0BAA0B,CAAyB,IAAI,CAAC,CAAA;QACxD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,sBAAsB,CAAC,SAAS,CAAC,CAAA;QAC7D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACrB,CAAC;IACD,WAAW;QACT,OAAO,IAAI,CAAC,qBAAqB,CAAA;IACnC,CAAC;CACF;AACD,WAAW,CAAC,sBAAsB,CAAC,CAAA;AAEnC,MAAM,OAAO,sBAAsB;IAYjC,YAAa,KAAyB;QAHtC,iBAAY,GAAmB,EAAE,CAAA;QAI/B,4EAA4E;QAC5E,KAAK,CAAC,KAAK,YAAY,kBAAkB,EAAE,oCAAoC,CAAC,CAAA;QAChF,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,wEAAwE;QACxE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,+BAA+B,CAAA;QACjE,6BAA6B,CAAyB,IAAI,EAAE,QAAQ,CAAC,CAAA;QACrE,0BAA0B,CAAyB,IAAI,CAAC,CAAA;QACxD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,sBAAsB,CAAC,SAAS,CAAC,CAAA;QAC7D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACrB,CAAC;IACD,WAAW;QACT,OAAO,IAAI,CAAC,qBAAqB,CAAA;IACnC,CAAC;CACF;AACD,WAAW,CAAC,sBAAsB,CAAC,CAAA;AAEnC,MAAM,OAAO,2BAA2B;IAmBtC,YAAa,KAA8B;QAT3C,iBAAY,GAAmB,EAAE,CAAA;QAU/B,sFAAsF;QACtF,KAAK,CAAC,KAAK,YAAY,uBAAuB,EAAE,yCAAyC,CAAC,CAAA;QAC1F,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,MAAM,CAAsB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAA;QAC/E,wEAAwE;QACxE,MAAM,OAAO,GAAG,gBAAgB,CAAC,+BAA+B,CAAA;QAChE,6BAA6B,CAA8B,IAAI,EAAE,OAAO,CAAC,CAAA;QACzE,0BAA0B,CAA8B,IAAI,CAAC,CAAA;QAC7D,yBAAyB,CAA8B,IAAI,EAAE,OAAO,CAAC,CAAA;QACrE,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,2BAA2B,CAAC,SAAS,CAAC,CAAA;QAClE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACrB,CAAC;IACD,WAAW;QACT,OAAO,IAAI,CAAC,qBAAqB,IAAI,IAAI,CAAC,YAAY,CAAA;IACxD,CAAC;CACF;AACD,WAAW,CAAC,2BAA2B,CAAC,CAAA;AAExC,MAAM,OAAO,2BAA2B;IAiBtC,YAAa,KAA8B;QAP3C,iBAAY,GAAmB,EAAE,CAAA;QAQ/B,sFAAsF;QACtF,KAAK,CAAC,KAAK,YAAY,uBAAuB,EAAE,yCAAyC,CAAC,CAAA;QAC1F,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,MAAM,CAAsB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAA;QAC/E,wEAAwE;QACxE,MAAM,OAAO,GAAG,gBAAgB,CAAC,+BAA+B,CAAA;QAChE,6BAA6B,CAA8B,IAAI,EAAE,OAAO,CAAC,CAAA;QACzE,0BAA0B,CAA8B,IAAI,CAAC,CAAA;QAC7D,yBAAyB,CAA8B,IAAI,EAAE,OAAO,CAAC,CAAA;QACrE,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,2BAA2B,CAAC,SAAS,CAAC,CAAA;QAClE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACrB,CAAC;IACD,WAAW;QACT,OAAO,IAAI,CAAC,YAAY,CAAA;IAC1B,CAAC;CACF;AACD,WAAW,CAAC,2BAA2B,CAAC,CAAA;AAExC,MAAM,UAAU,oBAAoB,CAAE,GAAQ;IAC5C,OAAO,CAAC,GAAG,YAAY,2BAA2B,CAAC,IAAI,CAAC,GAAG,YAAY,sBAAsB,CAAC,CAAA;AAChG,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAE,GAAQ;IAC5C,OAAO,CAAC,GAAG,YAAY,2BAA2B,CAAC,IAAI,CAAC,GAAG,YAAY,sBAAsB,CAAC,CAAA;AAChG,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAsC,QAAW,EAAE,QAA0B;IACxH,IAAI,wBAAwB,GAAG,KAAK,CAAA;IACpC,IAAI,kBAA8B,CAAA;IAClC,mEAAmE;IACnE,uDAAuD;IACvD,0DAA0D;IAC1D,oDAAoD;IACpD,IAAI,kBAA8B,CAAA;IAElC,MAAM,qBAAqB,GAAG,CAAC,OAAmB,EAAE,KAAmB,EAAE,EAAE;QACzE,mGAAmG;QACnG,KAAK,CAAC,CAAC,kBAAkB,EAAE,yCAAyC,CAAC,CAAA;QACrE,+CAA+C;QAC/C,KAAK,CAAC,OAAO,YAAY,UAAU,EAAE,8BAA8B,CAAC,CAAA;QACpE;;;;WAIG;QACH,KAAK,CAAC,OAAO,CAAC,UAAU,KAAK,CAAC,EAAE,oDAAoD,CAAC,CAAA;QACrF;;;WAGG;QACH,KAAK,CAAC,OAAO,CAAC,UAAU,KAAK,QAAQ,CAAC,KAAK,CAAC,cAAc,EAAE,6DAA6D,CAAC,CAAA;QAE1H,kGAAkG;QAClG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,YAAY,EAAE,wBAAwB,CAAC,CAAA;QAC7E,qEAAqE;QACrE,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,QAAQ,EAAE,mCAAmC,CAAC,CAAA;QAClE,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAEjC,kBAAkB,GAAG,OAAO,CAAA;QAC5B,kBAAkB,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,CAAA;QAE5C,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAA;IACD,MAAM,qBAAqB,GAAG,GAAe,EAAE;QAC7C,2EAA2E;QAC3E,KAAK,CAAC,kBAAkB,EAAE,qCAAqC,CAAC,CAAA;QAChE;;WAEG;QACH,KAAK,CAAC,CAAC,wBAAwB,EAAE,qCAAqC,CAAC,CAAA;QACvE,uEAAuE;QACvE,KAAK,CAAC,eAAe,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,EAAE,wCAAwC,CAAC,CAAA;QACxG,OAAO,kBAAkB,CAAA;IAC3B,CAAC,CAAA;IACD,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,uBAAuB,EAAE;QACvD,8DAA8D;QAC9D,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,kBAAkB,IAAI,CAAC,wBAAwB;QAC5D,UAAU,EAAE,IAAI;KACjB,CAAC,CAAA;IACF,MAAM,sBAAsB,GAAG,GAAG,EAAE;QAClC;;;;;;WAMG;QACH,IAAI,UAAU,GAAG,CAAC,CAAA;QAClB,gGAAgG;QAChG,IAAI,CAAC,kBAAkB,EAAE;YACvB,kBAAkB,GAAG,IAAI,UAAU,EAAE,CAAA;YACrC,UAAU,IAAI,CAAC,CAAA;SAChB;QACD,gGAAgG;QAChG,IAAI,CAAC,kBAAkB,EAAE;YACvB,kBAAkB,GAAG,IAAI,UAAU,EAAE,CAAA;YACrC,UAAU,IAAI,CAAC,CAAA;SAChB;QACD,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAC1B,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAC1B,wBAAwB,GAAG,IAAI,CAAA;QAE/B;;WAEG;QACH,KAAK,CAAC,UAAU,KAAK,CAAC,IAAI,UAAU,KAAK,CAAC,EAAE,8DAA8D,CAAC,CAAA;QAC3G,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAA;IACD,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,0BAA0B,EAAE;QAC1D,GAAG,EAAE,GAAG,EAAE;YACR,wEAAwE;YACxE,KAAK,CAAC,kBAAkB,EAAE,qCAAqC,CAAC,CAAA;YAChE;;;;;eAKG;YACH,KAAK,CAAC,CAAC,wBAAwB,EAAE,qCAAqC,CAAC,CAAA;YACvE,OAAO,kBAAkB,CAAC,UAAU,CAAA;QACtC,CAAC;QACD,UAAU,EAAE,IAAI;KACjB,CAAC,CAAA;IAEF,gBAAgB,CAAC,QAAQ,EAAE,uBAAuB,EAAE,qBAAqB,CAAC,CAAA;IAC1E,gBAAgB,CAAC,QAAQ,EAAE,uBAAuB,EAAE,qBAAqB,CAAC,CAAA;IAC1E,gBAAgB,CAAC,QAAQ,EAAE,wBAAwB,EAAE,sBAAsB,CAAC,CAAA;IAE5E,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAmC,QAAW;IACtF,MAAM,iBAAiB,GAAuB,EAAE,CAAA;IAChD,IAAI,YAA8C,CAAA;IAElD,MAAM,mBAAmB,GAAG,CAAC,GAAqB,EAAE,KAAuB,EAAE,EAAE;QAC7E;;;WAGG;QACH,KAAK,CAAC,QAAQ,CAAC,qBAAqB,EAAE,+BAA+B,CAAC,CAAA;QACtE;;;WAGG;QACH,KAAK,CAAC,GAAG,YAAY,gBAAgB,EAAE,0CAA0C,CAAC,CAAA;QAElF,mEAAmE;QACnE,KAAK,CAAC,KAAK,GAAG,gBAAgB,CAAC,+BAA+B,EAAE,sCAAsC,CAAC,CAAA;QACvG;;;;WAIG;QACH,IAAI,qBAAqB,CAAC,iBAAiB,EAAE,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC,EAAE;YACxE,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,KAAK,CAAA;SACxC;aAAM;YACL,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC,CAAA;SAC/F;QAED,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC3B,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAA;IAED,gBAAgB,CAAC,QAAQ,EAAE,qBAAqB,EAAE,mBAAmB,CAAC,CAAA;IACtE,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,mBAAmB,EAAE;QACnD,qDAAqD;QACrD,0BAA0B;QAC1B,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,iBAAiB,CAAC;QACjC,UAAU,EAAE,IAAI;KACjB,CAAC,CAAA;IACF,MAAM,eAAe,GAAG,CAAC,GAAiB,EAAE,EAAE;QAC5C;;;WAGG;QACH,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,EAAE,sDAAsD,CAAC,CAAA;QAC5F,wFAAwF;QACxF,KAAK,CAAC,CAAC,YAAY,EAAE,qCAAqC,CAAC,CAAA;QAC3D,+CAA+C;QAC/C,KAAK,CAAC,GAAG,YAAY,YAAY,EAAE,6BAA6B,CAAC,CAAA;QACjE,YAAY,GAAG,GAAG,CAAA;QAClB,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAA;IACD,gBAAgB,CAAC,QAAQ,EAAE,iBAAiB,EAAE,eAAe,CAAC,CAAA;IAC9D,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,cAAc,EAAE;QAC9C,GAAG,EAAE,GAAG,EAAE;YACR;;;eAGG;YACH,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,KAAK,CAAC,CAAC,YAAY,EAAE,wCAAwC,CAAC,CAAA;YACnG,OAAO,YAAY,CAAA;QACrB,CAAC;QACD,UAAU,EAAE,IAAI;KACjB,CAAC,CAAA;IAEF,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,uFAAuF;AACvF,SAAS,qBAAqB,CAAE,IAAwB,EAAE,MAAsB,EAAE,GAAqB;IACrG,OAAO,IAAI,CAAC,MAAM,KAAK,CAAC;QACxB,MAAM,CAAC,MAAM,KAAK,CAAC;QACnB,GAAG,CAAC,UAAU,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY;QACzC,GAAG,CAAC,YAAY,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;AACxC,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAmC,QAAW;IACtF,mBAAmB;IACnB,IAAI,eAAoD,CAAA;IACxD,MAAM,kBAAkB,GAAG,CAAC,GAAoB,EAAE,EAAE;QAClD;;;WAGG;QACH,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,EAAE,sDAAsD,CAAC,CAAA;QAC5F,8FAA8F;QAC9F,KAAK,CAAC,CAAC,eAAe,EAAE,wCAAwC,CAAC,CAAA;QACjE,kDAAkD;QAClD,KAAK,CAAC,GAAG,YAAY,eAAe,EAAE,6BAA6B,CAAC,CAAA;QACpE,eAAe,GAAG,GAAG,CAAA;QACrB,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAA;IACD,gBAAgB,CAAC,QAAQ,EAAE,oBAAoB,EAAE,kBAAkB,CAAC,CAAA;IACpE,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,iBAAiB,EAAE;QACjD,GAAG,EAAE,GAAG,EAAE;YACR;;;eAGG;YACH,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,KAAK,CAAC,CAAC,eAAe,EAAE,wCAAwC,CAAC,CAAA;YACtG,OAAO,eAAe,CAAA;QACxB,CAAC;QACD,UAAU,EAAE,IAAI;KACjB,CAAC,CAAA;IAEF,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAkC,QAAW,EAAE,QAA0B;IAChH,IAAI,SAAuE,CAAA;IAE3E,MAAM,YAAY,GAAG,CAAC,OAAiD,EAAE,KAAmB,EAAE,EAAE;QAC9F,iFAAiF;QACjF,KAAK,CAAC,CAAC,SAAS,EAAE,2BAA2B,CAAC,CAAA;QAC9C,qDAAqD;QACrD,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,uBAAuB,CAAC,OAAO,CAAC,EAAE,2BAA2B,CAAC,CAAA;QAC5F,+EAA+E;QAC/E,KAAK,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,oCAAoC,CAAC,CAAA;QAEhF;;WAEG;QACH,IAAI,CAAC,QAAQ,CAAC,qBAAqB,EAAE;YACnC,iGAAiG;YACjG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,YAAY,EAAE,wBAAwB,CAAC,CAAA;YAC7E,qEAAqE;YACrE,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,QAAQ,EAAE,mCAAmC,CAAC,CAAA;YAClE;;;;;eAKG;YACH,QAAQ,CAAC,sBAAsB,EAAE,CAAA;YACjC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;SAClC;QAED,IAAI,WAAW,CAAC,OAAO,CAAC,EAAE;YACxB,SAAS,GAAG,OAAO,CAAA;SACpB;aAAM;YACL,MAAM,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAA;YAC3D,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,CAAC,CAAA;SACvE;QAED,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAA;IAED,gBAAgB,CAAC,QAAQ,EAAE,cAAc,EAAE,YAAY,CAAC,CAAA;IACxD,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,sEAAsE;QACtE,KAAK,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAA;QAC1C,kDAAkD;QAClD,wDAAwD;QACxD,OAA2D,SAAS,CAAA;IACtE,CAAC,CAAA;IACD,gBAAgB,CAAC,QAAQ,EAAE,cAAc,EAAE,YAAY,CAAC,CAAA;IAExD,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,cAAc,EAAE;QAC9C,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS;QACtB,UAAU,EAAE,IAAI;KACjB,CAAC,CAAA;IAEF,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,MAAM,UAAU,WAAW,CAAE,OAAY;IACvC,OAAO,OAAO;QACZ,WAAW,IAAI,OAAO;QACtB,MAAM,IAAI,OAAO;QACjB,WAAW,IAAI,OAAO;QACtB,QAAQ,IAAI,OAAO;QACnB,aAAa,IAAI,OAAO,CAAA;AAC5B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,OAAiD,EACjD,QAAW;IAEX,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;QACzB,MAAM,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAA;QAC3D,OAAO,gBAAgB,CAAC,iBAAiB,EAAE,QAAQ,CAAC;YAClD,gBAAgB,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAA;KACnD;IAED,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAA;IACvC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,KAAK,CAAA;IAE5C;;;OAGG;IAEH,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAA;IACxD,4CAA4C;IAC5C,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IAElC,4BAA4B;IAC5B,OAAO,IAAI,KAAK,QAAQ;QACtB,uBAAuB;QACvB,CAAC,CAAC,GAAG,IAAI,IAAI,KAAK,GAAG,CAAC;YACrB,CAAC,IAAI,KAAK,UAAU,IAAI,MAAM,KAAK,SAAS,CAAC,CAAC;QAC/C;;WAEG;QACH,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACzC,8EAA8E;QAC9E,CAAC,WAAW,CAAA;AAChB,CAAC;AAED,SAAS,uBAAuB,CAAE,OAAY;IAC5C,MAAM,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAA;IAC3D,OAAO,WAAW,CAAC,iBAAiB,CAAC,IAAI,WAAW,CAAC,oBAAoB,CAAC,CAAA;AAC5E,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAkC,QAAW;IAC9E,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAA;IAC1B,IAAI,KAAK,CAAC,GAAG;QAAE,OAAO,WAAW,CAAA;IACjC,OAAO,yBAAyB,CAAC,QAAQ,CAAC,CAAA;AAC5C,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAkC,QAAW;IACpF,IAAI,QAAQ,YAAY,2BAA2B;QAAE,OAAO,SAAS,CAAA;IACrE,IAAI,QAAQ,YAAY,2BAA2B;QAAE,OAAO,SAAS,CAAA;IAErE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;AACzC,CAAC"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cryptographic_material.js","sourceRoot":"","sources":["../../src/cryptographic_material.ts"],"names":[],"mappings":"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"}

build/module/keyring.d.ts

 import { EncryptedDataKey } from './encrypted_data_key';
-import { EncryptionContext, EncryptionMaterial, DecryptionMaterial, SupportedAlgorithmSuites } from './types';
+import { EncryptionMaterial, DecryptionMaterial, SupportedAlgorithmSuites } from './types';
 import { NodeAlgorithmSuite } from './node_algorithms';
 import { WebCryptoAlgorithmSuite } from './web_crypto_algorithms';
 export declare abstract class Keyring<S extends SupportedAlgorithmSuites> {
-    onEncrypt(material: EncryptionMaterial<S>, context?: EncryptionContext): Promise<EncryptionMaterial<S>>;
-    abstract _onEncrypt(material: EncryptionMaterial<S>, context?: EncryptionContext): Promise<EncryptionMaterial<S>>;
-    onDecrypt(material: DecryptionMaterial<S>, encryptedDataKeys: EncryptedDataKey[], context?: EncryptionContext): Promise<DecryptionMaterial<S>>;
-    abstract _onDecrypt(material: DecryptionMaterial<S>, encryptedDataKeys: EncryptedDataKey[], context?: EncryptionContext): Promise<DecryptionMaterial<S>>;
+    onEncrypt(material: EncryptionMaterial<S>): Promise<EncryptionMaterial<S>>;
+    abstract _onEncrypt(material: EncryptionMaterial<S>): Promise<EncryptionMaterial<S>>;
+    onDecrypt(material: DecryptionMaterial<S>, encryptedDataKeys: EncryptedDataKey[]): Promise<DecryptionMaterial<S>>;
+    abstract _onDecrypt(material: DecryptionMaterial<S>, encryptedDataKeys: EncryptedDataKey[]): Promise<DecryptionMaterial<S>>;
 }
@@ -11,0 +11,0 @@ export declare abstract class KeyringNode extends Keyring<NodeAlgorithmSuite> {

build/module/keyring.js

@@ -26,5 +26,5 @@ /*
 export class Keyring {
-    async onEncrypt(material, context) {
+    async onEncrypt(material) {
         /* Precondition: material must be a type of isEncryptionMaterial.
-         * There are several security properties that NodeEncryptionMaterial and WebCryptoEncrypionMaterial
+         * There are several security properties that NodeEncryptionMaterial and WebCryptoEncryptionMaterial
          * posses.
@@ -36,3 +36,3 @@ * The unencryptedDataKey can only be written once.
         needs(isEncryptionMaterial(material), 'Unsupported type of material.');
-        const _material = await this._onEncrypt(material, context);
+        const _material = await this._onEncrypt(material);
         /* Postcondition: The EncryptionMaterial objects must be the same.
@@ -45,3 +45,3 @@ * See cryptographic_materials.ts.  The CryptographicMaterial objects
         needs(material === _material, 'New EncryptionMaterial instances can not be created.');
-        /* Postcondition: If this keyring generated data key, it must be the right length.
+        /* Postcondition UNTESTED: If this keyring generated data key, it must be the right length.
          * See cryptographic_materials.ts This is handled in setUnencryptedDataKey
@@ -63,3 +63,3 @@ * this condition is listed here to keep help keep track of important conditions
      */
-    async onDecrypt(material, encryptedDataKeys, context) {
+    async onDecrypt(material, encryptedDataKeys) {
         /* Precondition: material must be DecryptionMaterial. */
@@ -72,3 +72,3 @@ needs(isDecryptionMaterial(material), 'Unsupported material type.');
         needs(encryptedDataKeys.every(edk => edk instanceof EncryptedDataKey), 'Unsupported EncryptedDataKey type');
-        const _material = await this._onDecrypt(material, encryptedDataKeys, context);
+        const _material = await this._onDecrypt(material, encryptedDataKeys);
         /* Postcondition: The DecryptionMaterial objects must be the same.
@@ -97,2 +97,2 @@ * See cryptographic_materials.ts.  The CryptographicMaterial objects
 immutableClass(KeyringWebCrypto);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5cmluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXlyaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7Ozs7O0dBYUc7QUFFSCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUN2RCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFFdEUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLG9CQUFvQixFQUFFLE1BQU0sMEJBQTBCLENBQUE7QUFFckYsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLFNBQVMsQ0FBQTtBQUkvQjs7Ozs7R0FLRztBQUVILE1BQU0sT0FBZ0IsT0FBTztJQUMzQixLQUFLLENBQUMsU0FBUyxDQUFFLFFBQStCLEVBQUUsT0FBMkI7UUFDM0U7Ozs7OztXQU1HO1FBQ0gsS0FBSyxDQUFDLG9CQUFvQixDQUFDLFFBQVEsQ0FBQyxFQUFFLCtCQUErQixDQUFDLENBQUE7UUFFdEUsTUFBTSxTQUFTLEdBQUcsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQTtRQUUxRDs7Ozs7V0FLRztRQUNILEtBQUssQ0FBQyxRQUFRLEtBQUssU0FBUyxFQUFFLHNEQUFzRCxDQUFDLENBQUE7UUFFckY7OztVQUdFO1FBRUYsT0FBTyxRQUFRLENBQUE7SUFDakIsQ0FBQztJQUlEOzs7Ozs7Ozs7O09BVUc7SUFDSCxLQUFLLENBQUMsU0FBUyxDQUFFLFFBQStCLEVBQUUsaUJBQXFDLEVBQUUsT0FBMkI7UUFDbEgsd0RBQXdEO1FBQ3hELEtBQUssQ0FBQyxvQkFBb0IsQ0FBQyxRQUFRLENBQUMsRUFBRSw0QkFBNEIsQ0FBQyxDQUFBO1FBRW5FLDBGQUEwRjtRQUMxRixJQUFJLFFBQVEsQ0FBQyxXQUFXLEVBQUU7WUFBRSxPQUFPLFFBQVEsQ0FBQTtRQUUzQyxtRUFBbUU7UUFDbkUsS0FBSyxDQUFDLGlCQUFpQixDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsWUFBWSxnQkFBZ0IsQ0FBQyxFQUFFLG1DQUFtQyxDQUFDLENBQUE7UUFFM0csTUFBTSxTQUFTLEdBQUcsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxpQkFBaUIsRUFBRSxPQUFPLENBQUMsQ0FBQTtRQUU3RTs7Ozs7V0FLRztRQUNILEtBQUssQ0FBQyxRQUFRLEtBQUssU0FBUyxFQUFFLHNEQUFzRCxDQUFDLENBQUE7UUFFckY7Ozs7O1dBS0c7UUFFSCxPQUFPLFFBQVEsQ0FBQTtJQUNqQixDQUFDO0NBR0Y7QUFFRCxrQkFBa0IsQ0FBQyxPQUFPLENBQUMsQ0FBQTtBQUUzQixNQUFNLE9BQWdCLFdBQVksU0FBUSxPQUEyQjtDQUFHO0FBQ3hFLGNBQWMsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUMzQixNQUFNLE9BQWdCLGdCQUFpQixTQUFRLE9BQWdDO0NBQUc7QUFDbEYsY0FBYyxDQUFDLGdCQUFnQixDQUFDLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5cmluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXlyaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7Ozs7O0dBYUc7QUFFSCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUN2RCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFFdEUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLG9CQUFvQixFQUFFLE1BQU0sMEJBQTBCLENBQUE7QUFFckYsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLFNBQVMsQ0FBQTtBQUkvQjs7Ozs7R0FLRztBQUVILE1BQU0sT0FBZ0IsT0FBTztJQUMzQixLQUFLLENBQUMsU0FBUyxDQUFFLFFBQStCO1FBQzlDOzs7Ozs7V0FNRztRQUNILEtBQUssQ0FBQyxvQkFBb0IsQ0FBQyxRQUFRLENBQUMsRUFBRSwrQkFBK0IsQ0FBQyxDQUFBO1FBRXRFLE1BQU0sU0FBUyxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUVqRDs7Ozs7V0FLRztRQUNILEtBQUssQ0FBQyxRQUFRLEtBQUssU0FBUyxFQUFFLHNEQUFzRCxDQUFDLENBQUE7UUFFckY7OztVQUdFO1FBRUYsT0FBTyxRQUFRLENBQUE7SUFDakIsQ0FBQztJQUlEOzs7Ozs7Ozs7O09BVUc7SUFDSCxLQUFLLENBQUMsU0FBUyxDQUFFLFFBQStCLEVBQUUsaUJBQXFDO1FBQ3JGLHdEQUF3RDtRQUN4RCxLQUFLLENBQUMsb0JBQW9CLENBQUMsUUFBUSxDQUFDLEVBQUUsNEJBQTRCLENBQUMsQ0FBQTtRQUVuRSwwRkFBMEY7UUFDMUYsSUFBSSxRQUFRLENBQUMsV0FBVyxFQUFFO1lBQUUsT0FBTyxRQUFRLENBQUE7UUFFM0MsbUVBQW1FO1FBQ25FLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLFlBQVksZ0JBQWdCLENBQUMsRUFBRSxtQ0FBbUMsQ0FBQyxDQUFBO1FBRTNHLE1BQU0sU0FBUyxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLEVBQUUsaUJBQWlCLENBQUMsQ0FBQTtRQUVwRTs7Ozs7V0FLRztRQUNILEtBQUssQ0FBQyxRQUFRLEtBQUssU0FBUyxFQUFFLHNEQUFzRCxDQUFDLENBQUE7UUFFckY7Ozs7O1dBS0c7UUFFSCxPQUFPLFFBQVEsQ0FBQTtJQUNqQixDQUFDO0NBR0Y7QUFFRCxrQkFBa0IsQ0FBQyxPQUFPLENBQUMsQ0FBQTtBQUUzQixNQUFNLE9BQWdCLFdBQVksU0FBUSxPQUEyQjtDQUFHO0FBQ3hFLGNBQWMsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUMzQixNQUFNLE9BQWdCLGdCQUFpQixTQUFRLE9BQWdDO0NBQUc7QUFDbEYsY0FBYyxDQUFDLGdCQUFnQixDQUFDLENBQUEifQ==

build/module/materials_manager.d.ts

 import { EncryptionRequest, DecryptionRequest } from '.';
-import { EncryptionResponse, DecryptionResponse, SupportedAlgorithmSuites } from './types';
+import { EncryptionMaterial, DecryptionMaterial, SupportedAlgorithmSuites } from './types';
 import { NodeAlgorithmSuite } from './node_algorithms';
 import { WebCryptoAlgorithmSuite } from './web_crypto_algorithms';
 export interface GetEncryptionMaterials<S extends SupportedAlgorithmSuites> {
-    (request: EncryptionRequest<S>): Promise<EncryptionResponse<S>>;
+    (request: EncryptionRequest<S>): Promise<EncryptionMaterial<S>>;
 }
 export interface GetDecryptMaterials<S extends SupportedAlgorithmSuites> {
-    (request: DecryptionRequest<S>): Promise<DecryptionResponse<S>>;
+    (request: DecryptionRequest<S>): Promise<DecryptionMaterial<S>>;
 }
@@ -11,0 +11,0 @@ export interface MaterialsManager<S extends SupportedAlgorithmSuites> {

build/module/multi_keyring.d.ts

 import { Keyring, // eslint-disable-line no-unused-vars
 KeyringNode, KeyringWebCrypto } from './keyring';
-import { EncryptionContext, SupportedAlgorithmSuites } from './types';
+import { SupportedAlgorithmSuites } from './types';
 import { EncryptedDataKey } from './encrypted_data_key';
@@ -11,4 +11,4 @@ import { NodeAlgorithmSuite } from './node_algorithms';
     constructor(input: MultiKeyringInput<NodeAlgorithmSuite>);
-    _onEncrypt: (this: IMultiKeyring<NodeAlgorithmSuite>, material: import("./cryptographic_material").NodeEncryptionMaterial, context?: EncryptionContext | undefined) => Promise<import("./cryptographic_material").NodeEncryptionMaterial>;
-    _onDecrypt: (this: IMultiKeyring<NodeAlgorithmSuite>, material: import("./cryptographic_material").NodeDecryptionMaterial, encryptedDataKeys: EncryptedDataKey[], context?: EncryptionContext | undefined) => Promise<import("./cryptographic_material").NodeDecryptionMaterial>;
+    _onEncrypt: (this: IMultiKeyring<NodeAlgorithmSuite>, material: import("./cryptographic_material").NodeEncryptionMaterial) => Promise<import("./cryptographic_material").NodeEncryptionMaterial>;
+    _onDecrypt: (this: IMultiKeyring<NodeAlgorithmSuite>, material: import("./cryptographic_material").NodeDecryptionMaterial, encryptedDataKeys: EncryptedDataKey[]) => Promise<import("./cryptographic_material").NodeDecryptionMaterial>;
 }
@@ -19,4 +19,4 @@ export declare class MultiKeyringWebCrypto extends KeyringWebCrypto implements IMultiKeyring<WebCryptoAlgorithmSuite> {
     constructor(input: MultiKeyringInput<WebCryptoAlgorithmSuite>);
-    _onEncrypt: (this: IMultiKeyring<WebCryptoAlgorithmSuite>, material: import("./cryptographic_material").WebCryptoEncryptionMaterial, context?: EncryptionContext | undefined) => Promise<import("./cryptographic_material").WebCryptoEncryptionMaterial>;
-    _onDecrypt: (this: IMultiKeyring<WebCryptoAlgorithmSuite>, material: import("./cryptographic_material").WebCryptoDecryptionMaterial, encryptedDataKeys: EncryptedDataKey[], context?: EncryptionContext | undefined) => Promise<import("./cryptographic_material").WebCryptoDecryptionMaterial>;
+    _onEncrypt: (this: IMultiKeyring<WebCryptoAlgorithmSuite>, material: import("./cryptographic_material").WebCryptoEncryptionMaterial) => Promise<import("./cryptographic_material").WebCryptoEncryptionMaterial>;
+    _onDecrypt: (this: IMultiKeyring<WebCryptoAlgorithmSuite>, material: import("./cryptographic_material").WebCryptoDecryptionMaterial, encryptedDataKeys: EncryptedDataKey[]) => Promise<import("./cryptographic_material").WebCryptoDecryptionMaterial>;
 }
@@ -23,0 +23,0 @@ interface MultiKeyringInput<S extends SupportedAlgorithmSuites> {

build/module/multi_keyring.js

@@ -48,18 +48,24 @@ /*
 function buildPrivateOnEncrypt() {
-    return async function _onEncrypt(material, context) {
+    return async function _onEncrypt(material) {
+        /* Precondition: Only Keyrings explicitly designated as generators can generate material.
+         * Technically, the precondition below will handle this.
+         * Since if I do not have an unencrypted data key,
+         * and I do not have a generator,
+         * then generated.hasUnencryptedDataKey === false will throw.
+         * But this is a much more meaningful error.
+         */
+        needs(!material.hasUnencryptedDataKey ? this.generator : true, 'Only Keyrings explicitly designated as generators can generate material.');
         const generated = this.generator
-            ? await this.generator.onEncrypt(material, context)
+            ? await this.generator.onEncrypt(material)
             : material;
         /* Precondition: A Generator Keyring *must* ensure generated material. */
-        needs(this.generator && generated.hasUnencryptedDataKey, 'Generator Keyring has not generated material.');
-        /* Precondition: Only Keyrings explicitly designated as generators can generate material. */
-        needs(generated.hasUnencryptedDataKey, 'Only Keyrings explicitly designated as generators can generate material.');
+        needs(generated.hasUnencryptedDataKey, 'Generator Keyring has not generated material.');
         /* By default this is a serial operation.  A keyring _may_ perform an expensive operation
-      * or create resource constraints such that encrypting with multiple keyrings could
-      * fail in unexpected ways.
-      * Additionally, "downstream" keyrings may make choices about the EncryptedDataKeys they
-      * append based on already appended EDK's.
-      */
+         * or create resource constraints such that encrypting with multiple keyrings could
+         * fail in unexpected ways.
+         * Additionally, "downstream" keyrings may make choices about the EncryptedDataKeys they
+         * append based on already appended EDK's.
+         */
         for (const keyring of this.children) {
-            await keyring.onEncrypt(generated, context);
+            await keyring.onEncrypt(generated);
         }
@@ -73,3 +79,3 @@ // Keyrings are required to not create new EncryptionMaterial instances, but
 function buildPrivateOnDecrypt() {
-    return async function _onDecrypt(material, encryptedDataKeys, context) {
+    return async function _onDecrypt(material, encryptedDataKeys) {
         const children = this.children.slice();
@@ -83,3 +89,3 @@ if (this.generator)
             try {
-                await keyring.onDecrypt(material, encryptedDataKeys, context);
+                await keyring.onDecrypt(material, encryptedDataKeys);
             }
@@ -96,2 +102,2 @@ catch (e) {
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXVsdGlfa2V5cmluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tdWx0aV9rZXlyaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7Ozs7O0dBYUc7QUFFSCxPQUFPLEVBQUUsY0FBYyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFDcEUsT0FBTyxFQUNJLHFDQUFxQztBQUM5QyxXQUFXLEVBQ1gsZ0JBQWdCLEVBQ2pCLE1BQU0sV0FBVyxDQUFBO0FBRWxCLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxTQUFTLENBQUE7QUFLL0IsTUFBTSxPQUFPLGdCQUFpQixTQUFRLFdBQVc7SUFHL0MsWUFBYSxLQUE0QztRQUN2RCxLQUFLLEVBQUUsQ0FBQTtRQUdULGVBQVUsR0FBRyxxQkFBcUIsRUFBc0IsQ0FBQTtRQUN4RCxlQUFVLEdBQUcscUJBQXFCLEVBQXNCLENBQUE7UUFIdEQsa0JBQWtCLENBQUMsSUFBSSxFQUFFLFdBQVcsRUFBRSxLQUFLLENBQUMsQ0FBQTtJQUM5QyxDQUFDO0NBR0Y7QUFDRCxjQUFjLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtBQUVoQyxNQUFNLE9BQU8scUJBQXNCLFNBQVEsZ0JBQWdCO0lBSXpELFlBQWEsS0FBaUQ7UUFDNUQsS0FBSyxFQUFFLENBQUE7UUFHVCxlQUFVLEdBQUcscUJBQXFCLEVBQTJCLENBQUE7UUFDN0QsZUFBVSxHQUFHLHFCQUFxQixFQUEyQixDQUFBO1FBSDNELGtCQUFrQixDQUFDLElBQUksRUFBRSxnQkFBZ0IsRUFBRSxLQUFLLENBQUMsQ0FBQTtJQUNuRCxDQUFDO0NBR0Y7QUFDRCxjQUFjLENBQUMscUJBQXFCLENBQUMsQ0FBQTtBQUVyQyxTQUFTLGtCQUFrQixDQUN6QixHQUFxQixFQUNyQixXQUFnQixFQUNoQixFQUFFLFNBQVMsRUFBRSxRQUFRLEdBQUcsRUFBRSxFQUF3QjtJQUVsRCxvREFBb0Q7SUFDcEQsS0FBSyxDQUFDLFNBQVMsSUFBSSxRQUFRLENBQUMsTUFBTSxFQUFFLHFDQUFxQyxDQUFDLENBQUE7SUFDMUUsZ0RBQWdEO0lBQ2hELEtBQUssQ0FBQyxDQUFDLENBQUMsU0FBUyxLQUFLLFNBQVMsWUFBWSxXQUFXLEVBQUUsNkJBQTZCLENBQUMsQ0FBQTtJQUN0RixrREFBa0Q7SUFDbEQsS0FBSyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLFlBQVksV0FBVyxDQUFDLEVBQUUseUJBQXlCLENBQUMsQ0FBQTtJQUVqRixnQkFBZ0IsQ0FBQyxHQUFHLEVBQUUsVUFBVSxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQTtJQUNsRSxnQkFBZ0IsQ0FBQyxHQUFHLEVBQUUsV0FBVyxFQUFFLFNBQVMsQ0FBQyxDQUFBO0FBQy9DLENBQUM7QUFFRCxTQUFTLHFCQUFxQjtJQUM1QixPQUFPLEtBQUssVUFBVSxVQUFVLENBRTlCLFFBQStCLEVBQUUsT0FBMkI7UUFFNUQsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLFNBQVM7WUFDOUIsQ0FBQyxDQUFDLE1BQU0sSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsUUFBUSxFQUFFLE9BQU8sQ0FBQztZQUNuRCxDQUFDLENBQUMsUUFBUSxDQUFBO1FBRVoseUVBQXlFO1FBQ3pFLEtBQUssQ0FBQyxJQUFJLENBQUMsU0FBUyxJQUFJLFNBQVMsQ0FBQyxxQkFBcUIsRUFBRSwrQ0FBK0MsQ0FBQyxDQUFBO1FBQ3pHLDRGQUE0RjtRQUM1RixLQUFLLENBQUMsU0FBUyxDQUFDLHFCQUFxQixFQUFFLDBFQUEwRSxDQUFDLENBQUE7UUFFbEg7Ozs7O1FBS0E7UUFDQSxLQUFLLE1BQU0sT0FBTyxJQUFJLElBQUksQ0FBQyxRQUFRLEVBQUU7WUFDbkMsTUFBTSxPQUFPLENBQUMsU0FBUyxDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUMsQ0FBQTtTQUM1QztRQUVELDRFQUE0RTtRQUM1RSwwRUFBMEU7UUFDMUUsbUJBQW1CO1FBQ25CLE9BQU8sU0FBUyxDQUFBO0lBQ2xCLENBQUMsQ0FBQTtBQUNILENBQUM7QUFFRCxTQUFTLHFCQUFxQjtJQUM1QixPQUFPLEtBQUssVUFBVSxVQUFVLENBRTlCLFFBQStCLEVBQy9CLGlCQUFxQyxFQUNyQyxPQUEyQjtRQUUzQixNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQ3RDLElBQUksSUFBSSxDQUFDLFNBQVM7WUFBRSxRQUFRLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQTtRQUVwRCxLQUFLLE1BQU0sT0FBTyxJQUFJLFFBQVEsRUFBRTtZQUNoQyxnR0FBZ0c7WUFDOUYsSUFBSSxRQUFRLENBQUMsV0FBVyxFQUFFO2dCQUFFLE9BQU8sUUFBUSxDQUFBO1lBRTNDLElBQUk7Z0JBQ0YsTUFBTSxPQUFPLENBQUMsU0FBUyxDQUFDLFFBQVEsRUFBRSxpQkFBaUIsRUFBRSxPQUFPLENBQUMsQ0FBQTthQUM5RDtZQUFDLE9BQU8sQ0FBQyxFQUFFO2dCQUNaLDZDQUE2QztnQkFDN0MsMERBQTBEO2dCQUMxRCwwREFBMEQ7Z0JBQzFELDJCQUEyQjthQUMxQjtTQUNGO1FBQ0QsT0FBTyxRQUFRLENBQUE7SUFDakIsQ0FBQyxDQUFBO0FBQ0gsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXVsdGlfa2V5cmluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tdWx0aV9rZXlyaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7Ozs7O0dBYUc7QUFFSCxPQUFPLEVBQUUsY0FBYyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFDcEUsT0FBTyxFQUNJLHFDQUFxQztBQUM5QyxXQUFXLEVBQ1gsZ0JBQWdCLEVBQ2pCLE1BQU0sV0FBVyxDQUFBO0FBRWxCLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxTQUFTLENBQUE7QUFLL0IsTUFBTSxPQUFPLGdCQUFpQixTQUFRLFdBQVc7SUFHL0MsWUFBYSxLQUE0QztRQUN2RCxLQUFLLEVBQUUsQ0FBQTtRQUdULGVBQVUsR0FBRyxxQkFBcUIsRUFBc0IsQ0FBQTtRQUN4RCxlQUFVLEdBQUcscUJBQXFCLEVBQXNCLENBQUE7UUFIdEQsa0JBQWtCLENBQUMsSUFBSSxFQUFFLFdBQVcsRUFBRSxLQUFLLENBQUMsQ0FBQTtJQUM5QyxDQUFDO0NBR0Y7QUFDRCxjQUFjLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtBQUVoQyxNQUFNLE9BQU8scUJBQXNCLFNBQVEsZ0JBQWdCO0lBSXpELFlBQWEsS0FBaUQ7UUFDNUQsS0FBSyxFQUFFLENBQUE7UUFHVCxlQUFVLEdBQUcscUJBQXFCLEVBQTJCLENBQUE7UUFDN0QsZUFBVSxHQUFHLHFCQUFxQixFQUEyQixDQUFBO1FBSDNELGtCQUFrQixDQUFDLElBQUksRUFBRSxnQkFBZ0IsRUFBRSxLQUFLLENBQUMsQ0FBQTtJQUNuRCxDQUFDO0NBR0Y7QUFDRCxjQUFjLENBQUMscUJBQXFCLENBQUMsQ0FBQTtBQUVyQyxTQUFTLGtCQUFrQixDQUN6QixHQUFxQixFQUNyQixXQUFnQixFQUNoQixFQUFFLFNBQVMsRUFBRSxRQUFRLEdBQUcsRUFBRSxFQUF3QjtJQUVsRCxvREFBb0Q7SUFDcEQsS0FBSyxDQUFDLFNBQVMsSUFBSSxRQUFRLENBQUMsTUFBTSxFQUFFLHFDQUFxQyxDQUFDLENBQUE7SUFDMUUsZ0RBQWdEO0lBQ2hELEtBQUssQ0FBQyxDQUFDLENBQUMsU0FBUyxLQUFLLFNBQVMsWUFBWSxXQUFXLEVBQUUsNkJBQTZCLENBQUMsQ0FBQTtJQUN0RixrREFBa0Q7SUFDbEQsS0FBSyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLFlBQVksV0FBVyxDQUFDLEVBQUUseUJBQXlCLENBQUMsQ0FBQTtJQUVqRixnQkFBZ0IsQ0FBQyxHQUFHLEVBQUUsVUFBVSxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQTtJQUNsRSxnQkFBZ0IsQ0FBQyxHQUFHLEVBQUUsV0FBVyxFQUFFLFNBQVMsQ0FBQyxDQUFBO0FBQy9DLENBQUM7QUFFRCxTQUFTLHFCQUFxQjtJQUM1QixPQUFPLEtBQUssVUFBVSxVQUFVLENBRTlCLFFBQStCO1FBRS9COzs7Ozs7V0FNRztRQUNILEtBQUssQ0FBQyxDQUFDLFFBQVEsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLDBFQUEwRSxDQUFDLENBQUE7UUFFMUksTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLFNBQVM7WUFDOUIsQ0FBQyxDQUFDLE1BQU0sSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDO1lBQzFDLENBQUMsQ0FBQyxRQUFRLENBQUE7UUFFWix5RUFBeUU7UUFDekUsS0FBSyxDQUFDLFNBQVMsQ0FBQyxxQkFBcUIsRUFBRSwrQ0FBK0MsQ0FBQyxDQUFBO1FBRXZGOzs7OztXQUtHO1FBQ0gsS0FBSyxNQUFNLE9BQU8sSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFO1lBQ25DLE1BQU0sT0FBTyxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsQ0FBQTtTQUNuQztRQUVELDRFQUE0RTtRQUM1RSwwRUFBMEU7UUFDMUUsbUJBQW1CO1FBQ25CLE9BQU8sU0FBUyxDQUFBO0lBQ2xCLENBQUMsQ0FBQTtBQUNILENBQUM7QUFFRCxTQUFTLHFCQUFxQjtJQUM1QixPQUFPLEtBQUssVUFBVSxVQUFVLENBRTlCLFFBQStCLEVBQy9CLGlCQUFxQztRQUVyQyxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQ3RDLElBQUksSUFBSSxDQUFDLFNBQVM7WUFBRSxRQUFRLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQTtRQUVwRCxLQUFLLE1BQU0sT0FBTyxJQUFJLFFBQVEsRUFBRTtZQUNoQyxnR0FBZ0c7WUFDOUYsSUFBSSxRQUFRLENBQUMsV0FBVyxFQUFFO2dCQUFFLE9BQU8sUUFBUSxDQUFBO1lBRTNDLElBQUk7Z0JBQ0YsTUFBTSxPQUFPLENBQUMsU0FBUyxDQUFDLFFBQVEsRUFBRSxpQkFBaUIsQ0FBQyxDQUFBO2FBQ3JEO1lBQUMsT0FBTyxDQUFDLEVBQUU7Z0JBQ1osNkNBQTZDO2dCQUM3QywwREFBMEQ7Z0JBQzFELDBEQUEwRDtnQkFDMUQsMkJBQTJCO2FBQzFCO1NBQ0Y7UUFDRCxPQUFPLFFBQVEsQ0FBQTtJQUNqQixDQUFDLENBQUE7QUFDSCxDQUFDIn0=

build/module/types.d.ts

@@ -26,19 +26,10 @@ import { NodeAlgorithmSuite } from './node_algorithms';
     readonly suite?: S;
-    readonly encryptionContext?: EncryptionContext;
-    readonly frameLength?: number;
+    readonly encryptionContext: EncryptionContext;
     readonly plaintextLength?: number;
 }
-export interface EncryptionResponse<S extends NodeAlgorithmSuite | WebCryptoAlgorithmSuite> {
-    material: EncryptionMaterial<S>;
-    context: EncryptionContext;
-}
 export interface DecryptionRequest<S extends NodeAlgorithmSuite | WebCryptoAlgorithmSuite> {
     readonly suite: S;
-    readonly encryptionContext?: EncryptionContext;
+    readonly encryptionContext: EncryptionContext;
     readonly encryptedDataKeys: ReadonlyArray<EncryptedDataKey>;
 }
-export interface DecryptionResponse<S extends NodeAlgorithmSuite | WebCryptoAlgorithmSuite> {
-    material: DecryptionMaterial<S>;
-    context: EncryptionContext;
-}
 export declare type SupportedAlgorithmSuites = NodeAlgorithmSuite | WebCryptoAlgorithmSuite;
@@ -45,0 +36,0 @@ export declare type EncryptionMaterial<Suite> = Suite extends NodeAlgorithmSuite ? NodeEncryptionMaterial : Suite extends WebCryptoAlgorithmSuite ? WebCryptoEncryptionMaterial : never;

CHANGELOG.md

@@ -6,2 +6,16 @@ # Change Log
 
+# [0.2.0-preview.3](/compare/@aws-crypto/material-management@0.2.0-preview.2...@aws-crypto/material-management@0.2.0-preview.3) (2019-08-08)
+
+
+### Bug Fixes
+
+* Conditions for materials-management (#185) 7f7228b, closes #185
+* Encryption Context changes (#148) 5a7e9ca, closes #148 #54
+* framLength is not passed to the CMM (#190) b60f653, closes #190 #161
+* Multi keyrings should not require a generator (#165) 11ff819, closes #165
+
+
+
+
+
 # [0.2.0-preview.2](/compare/@aws-crypto/material-management@0.2.0-preview.1...@aws-crypto/material-management@0.2.0-preview.2) (2019-07-24)
@@ -8,0 +22,0 @@

package.json

 {
   "name": "@aws-crypto/material-management",
-  "version": "0.2.0-preview.2",
+  "version": "0.2.0-preview.3",
   "scripts": {
@@ -52,3 +52,3 @@ "prepublishOnly": "npm run build",
   },
-  "gitHead": "970dbfad262186db90bd9ad2eba7a36d8a54ca18"
+  "gitHead": "698180f30c85ef77a5739ebadd676d4b41ad441f"
 }

No alert changes

Improved metrics

Total package byte prevSize

614202

2.91%

Lines of code

3988

1.48%

No dependency changes