Skip to content

add RC4 cipher #6

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.

Sign up for GitHub

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

Open
mildsunrise wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add RC4 cipher #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ browserify-cipher
[![Build Status](https://travis-ci.org/crypto-browserify/browserify-cipher.svg)](https://travis-ci.org/crypto-browserify/browserify-cipher)

Provides createCipher, createDecipher, createCipheriv, createDecipheriv and
getCiphers for the browserify. Includes AES and DES ciphers.
getCiphers for the browserify. Includes AES, DES and RC4 ciphers.
11 changes: 10 additions & 1 deletion browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
var RC4 = require('browserify-rc4')
var DES = require('browserify-des')
var aes = require('browserify-aes/browser')
var aesModes = require('browserify-aes/modes')
Expand All @@ -14,6 +15,9 @@ function createCipher (suite, password) {
} else if (desModes[suite]) {
keyLen = desModes[suite].key * 8
ivLen = desModes[suite].iv
} else if (suite === 'rc4') {
keyLen = 16
ivLen = 0
} else {
throw new TypeError('invalid suite type')
}
Expand All @@ -32,6 +36,9 @@ function createDecipher (suite, password) {
} else if (desModes[suite]) {
keyLen = desModes[suite].key * 8
ivLen = desModes[suite].iv
} else if (suite === 'rc4') {
keyLen = 16
ivLen = 0
} else {
throw new TypeError('invalid suite type')
}
Expand All @@ -44,6 +51,7 @@ function createCipheriv (suite, key, iv) {
suite = suite.toLowerCase()
if (aesModes[suite]) return aes.createCipheriv(suite, key, iv)
if (desModes[suite]) return new DES({ key: key, iv: iv, mode: suite })
if (suite === 'rc4') return new RC4(key, iv)

throw new TypeError('invalid suite type')
}
Expand All @@ -52,12 +60,13 @@ function createDecipheriv (suite, key, iv) {
suite = suite.toLowerCase()
if (aesModes[suite]) return aes.createDecipheriv(suite, key, iv)
if (desModes[suite]) return new DES({ key: key, iv: iv, mode: suite, decrypt: true })
if (suite === 'rc4') return new RC4(key, iv)

throw new TypeError('invalid suite type')
}

function getCiphers () {
return Object.keys(desModes).concat(aes.getCiphers())
return Object.keys(desModes).concat(aes.getCiphers()).concat(['rc4'])
}

exports.createCipher = exports.Cipher = createCipher
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"dependencies": {
"browserify-aes": "^1.0.4",
"browserify-des": "^1.0.0",
"browserify-rc4": "^1.0.0",
"evp_bytestokey": "^1.0.0"
},
"browser": "browser.js",
Expand Down
5 changes: 5 additions & 0 deletions test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,8 @@ Object.keys(desModes).forEach(function (modeName) {
var mode = desModes[modeName]
runIvTest(modeName, mode.key, mode.iv)
})

// rc4 admits arbitrary key sizes
runIvTest('rc4', 3, 0)
runIvTest('rc4', 16, 0)
runIvTest('rc4', 27, 0)