Skip to content

Commit d99cf9a

Browse files
author
Juho Enala
committed
Moved stuff into constants
1 parent 0cb286a commit d99cf9a

File tree

4 files changed

+28
-18
lines changed

4 files changed

+28
-18
lines changed

lib/constants.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
"use strict";
2+
3+
module.exports = {
4+
AES_STANDARD: 'AES-CBC',
5+
DEFAULT_MESSAGE_DIGEST: 'sha256'
6+
};

lib/crypt.js

+9-7
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@ var helpers = require('./helpers');
1010

1111
var forge = require('node-forge');
1212

13-
var pki = forge.pki;
14-
var rsa = pki.rsa;
13+
var pki = forge.pki,
14+
rsa = forge.rsa;
15+
16+
var _require = require('./constants'),
17+
DEFAULT_MESSAGE_DIGEST = _require.DEFAULT_MESSAGE_DIGEST,
18+
AES_STANDARD = _require.AES_STANDARD;
1519

1620
var Crypt =
1721
/*#__PURE__*/
@@ -21,10 +25,8 @@ function () {
2125

2226
_classCallCheck(this, Crypt);
2327

24-
this.AES_STANDARD = 'AES-CBC';
25-
this.DEFAULT_MD = 'sha256';
2628
this.options = Object.assign({}, {
27-
md: this.DEFAULT_MD,
29+
md: DEFAULT_MESSAGE_DIGEST,
2830
entropy: undefined
2931
}, options); // Add some entropy if available
3032

@@ -206,7 +208,7 @@ function () {
206208
}); // Create buffer and cipher
207209

208210
var buffer = forge.util.createBuffer(message, 'utf8');
209-
var cipher = forge.cipher.createCipher(this.AES_STANDARD, key); // Actual encryption
211+
var cipher = forge.cipher.createCipher(AES_STANDARD, key); // Actual encryption
210212

211213
cipher.start({
212214
iv: iv
@@ -258,7 +260,7 @@ function () {
258260
var key = privateKey.decrypt(keyBytes, 'RSA-OAEP'); // Create buffer and decipher
259261

260262
var buffer = forge.util.createBuffer(cipher);
261-
var decipher = forge.cipher.createDecipher(this.AES_STANDARD, key); // Actual decryption
263+
var decipher = forge.cipher.createDecipher(AES_STANDARD, key); // Actual decryption
262264

263265
decipher.start({
264266
iv: iv

src/constants.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// @flow
2+
3+
module.exports = {
4+
AES_STANDARD: 'AES-CBC',
5+
DEFAULT_MESSAGE_DIGEST: 'sha256',
6+
};

src/crypt.js

+7-11
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
// @flow
2-
var helpers = require('./helpers');
3-
var forge = require('node-forge');
4-
var pki = forge.pki;
5-
var rsa = pki.rsa;
2+
const helpers = require('./helpers');
3+
const forge = require('node-forge');
4+
const { pki, rsa } = forge;
5+
const { DEFAULT_MESSAGE_DIGEST, AES_STANDARD } = require('./constants');
66

77
class Crypt {
8-
AES_STANDARD: string;
9-
DEFAULT_MD: string;
108
options: Object;
119

1210
constructor(options: Object = {}) {
13-
this.AES_STANDARD = 'AES-CBC';
14-
this.DEFAULT_MD = 'sha256';
1511
this.options = Object.assign(
1612
{},
1713
{
18-
md: this.DEFAULT_MD,
14+
md: DEFAULT_MESSAGE_DIGEST,
1915
entropy: undefined,
2016
},
2117
options,
@@ -198,7 +194,7 @@ class Crypt {
198194

199195
// Create buffer and cipher
200196
const buffer = forge.util.createBuffer(message, 'utf8');
201-
const cipher = forge.cipher.createCipher(this.AES_STANDARD, key);
197+
const cipher = forge.cipher.createCipher(AES_STANDARD, key);
202198

203199
// Actual encryption
204200
cipher.start({ iv });
@@ -258,7 +254,7 @@ class Crypt {
258254

259255
// Create buffer and decipher
260256
const buffer = forge.util.createBuffer(cipher);
261-
const decipher = forge.cipher.createDecipher(this.AES_STANDARD, key);
257+
const decipher = forge.cipher.createDecipher(AES_STANDARD, key);
262258

263259
// Actual decryption
264260
decipher.start({ iv });

0 commit comments

Comments
 (0)