Skip to content

fix: frame length can not be 0 #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion modules/encrypt-browser/src/encrypt.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {
AlgorithmSuiteIdentifier,
getEncryptHelper,
KeyringWebCrypto,
needs,
WebCryptoMaterialsManager // eslint-disable-line no-unused-vars
} from '@aws-crypto/material-management-browser'
import {
Expand All @@ -35,7 +36,8 @@ import {
serializeSignatureInfo,
FRAME_LENGTH,
MESSAGE_ID_LENGTH,
raw2der
raw2der,
Maximum
} from '@aws-crypto/serialize'
import { fromUtf8 } from '@aws-sdk/util-utf8-browser'
import { getWebCryptoBackend } from '@aws-crypto/web-crypto-backend'
Expand All @@ -60,6 +62,9 @@ export async function encrypt (
plaintext: Uint8Array,
{ suiteId, encryptionContext, frameLength = FRAME_LENGTH }: EncryptInput = {}
): Promise<EncryptResult> {
/* Precondition: The frameLength must be less than the maximum frame size for browser encryption. */
needs(frameLength > 0 && Maximum.FRAME_SIZE >= frameLength, `frameLength out of bounds: 0 > frameLength >= ${Maximum.FRAME_SIZE}`)

const backend = await getWebCryptoBackend()
if (!backend) throw new Error('No supported crypto backend')

Expand Down
5 changes: 5 additions & 0 deletions modules/encrypt-browser/test/encrypt.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,9 @@ describe('encrypt structural testing', () => {

expect(messageHeader).to.deep.equal(messageInfo.messageHeader)
})

it('Precondition: The frameLength must be less than the maximum frame size for browser encryption.', async () => {
const frameLength = 0
expect(encrypt(keyRing, 'asdf', { frameLength })).to.rejectedWith(Error)
})
})
9 changes: 7 additions & 2 deletions modules/encrypt-node/src/encrypt_stream.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
import {
NodeDefaultCryptographicMaterialsManager, NodeAlgorithmSuite, AlgorithmSuiteIdentifier, // eslint-disable-line no-unused-vars
KeyringNode, NodeEncryptionMaterial, getEncryptHelper, EncryptionContext, // eslint-disable-line no-unused-vars
NodeMaterialsManager // eslint-disable-line no-unused-vars
NodeMaterialsManager, // eslint-disable-line no-unused-vars
needs
} from '@aws-crypto/material-management-node'
import { getFramedEncryptStream } from './framed_encrypt_stream'
import { SignatureStream } from './signature_stream'
Expand All @@ -26,7 +27,8 @@ import {
MessageHeader, // eslint-disable-line no-unused-vars
serializeFactory, kdfInfo, ContentType, SerializationVersion, ObjectType,
FRAME_LENGTH,
MESSAGE_ID_LENGTH
MESSAGE_ID_LENGTH,
Maximum
} from '@aws-crypto/serialize'

// @ts-ignore
Expand Down Expand Up @@ -56,6 +58,9 @@ export function encryptStream (
): Duplex {
const { suiteId, context, frameLength = FRAME_LENGTH } = op

/* Precondition: The frameLength must be less than the maximum frame size Node.js stream. */
needs(frameLength > 0 && Maximum.FRAME_SIZE >= frameLength, `frameLength out of bounds: 0 > frameLength >= ${Maximum.FRAME_SIZE}`)

/* If the cmm is a Keyring, wrap it with NodeDefaultCryptographicMaterialsManager. */
cmm = cmm instanceof KeyringNode
? new NodeDefaultCryptographicMaterialsManager(cmm)
Expand Down
5 changes: 5 additions & 0 deletions modules/encrypt-node/test/encrypt.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,11 @@ describe('encrypt structural testing', () => {

expect(messageHeader).to.deep.equal(messageInfo.messageHeader)
})

it('Precondition: The frameLength must be less than the maximum frame size Node.js stream.', async () => {
const frameLength = 0
expect(encrypt(keyRing, 'asdf', { frameLength })).to.rejectedWith(Error)
})
})

function finishedAsync (stream: any) {
Expand Down