Skip to content

Commit 882ea41

Browse files
davidlehndlongley
davidlehn
authored and
dlongley
committed
Convert code to CommonJS.
- Minimally invasive first pass conversion to CommonJS usage. - Change `forge.js` to be top-level container. Preserve code style of files adding properties to the `forge` object. - Add `index.js` as main node file. `require` other files as `forge.js` did before. - Remove boilerplate from all files. - Change dependencies into `require` calls.
1 parent d89547c commit 882ea41

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+269
-2516
lines changed

‎lib/aes.js

Lines changed: 5 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
*
1616
* Copyright (c) 2010-2014 Digital Bazaar, Inc.
1717
*/
18-
(function() {
19-
/* ########## Begin module implementation ########## */
20-
function initModule(forge) {
18+
var forge = require('./forge');
19+
require('./cipher');
20+
require('./cipherModes');
21+
require('./util');
2122

2223
/* AES API */
23-
forge.aes = forge.aes || {};
24+
module.exports = forge.aes = forge.aes || {};
2425

2526
/**
2627
* Deprecated. Instead, use:
@@ -1090,58 +1091,3 @@ function _createCipher(options) {
10901091

10911092
return cipher;
10921093
}
1093-
1094-
} // end module implementation
1095-
1096-
/* ########## Begin module wrapper ########## */
1097-
var name = 'aes';
1098-
if(typeof define !== 'function') {
1099-
// NodeJS -> AMD
1100-
if(typeof module === 'object' && module.exports) {
1101-
var nodeJS = true;
1102-
define = function(ids, factory) {
1103-
factory(require, module);
1104-
};
1105-
} else {
1106-
// <script>
1107-
if(typeof forge === 'undefined') {
1108-
forge = {};
1109-
}
1110-
return initModule(forge);
1111-
}
1112-
}
1113-
// AMD
1114-
var deps;
1115-
var defineFunc = function(require, module) {
1116-
module.exports = function(forge) {
1117-
var mods = deps.map(function(dep) {
1118-
return require(dep);
1119-
}).concat(initModule);
1120-
// handle circular dependencies
1121-
forge = forge || {};
1122-
forge.defined = forge.defined || {};
1123-
if(forge.defined[name]) {
1124-
return forge[name];
1125-
}
1126-
forge.defined[name] = true;
1127-
for(var i = 0; i < mods.length; ++i) {
1128-
mods[i](forge);
1129-
}
1130-
return forge[name];
1131-
};
1132-
};
1133-
var tmpDefine = define;
1134-
define = function(ids, factory) {
1135-
deps = (typeof ids === 'string') ? factory.slice(2) : ids.slice(2);
1136-
if(nodeJS) {
1137-
delete define;
1138-
return tmpDefine.apply(null, Array.prototype.slice.call(arguments, 0));
1139-
}
1140-
define = tmpDefine;
1141-
return define.apply(null, Array.prototype.slice.call(arguments, 0));
1142-
};
1143-
define(
1144-
['require', 'module', './cipher', './cipherModes', './util'], function() {
1145-
defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
1146-
});
1147-
})();

‎lib/aesCipherSuites.js

Lines changed: 4 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
* Copyright (c) 2009-2015 Digital Bazaar, Inc.
77
*
88
*/
9-
(function() {
10-
/* ########## Begin module implementation ########## */
11-
function initModule(forge) {
9+
var forge = require('./forge');
10+
require('./aes')
11+
require('./tls')
1212

13-
var tls = forge.tls;
13+
var tls = module.exports = forge.tls;
1414

1515
/**
1616
* Supported cipher suites.
@@ -282,57 +282,3 @@ function compareMacs(key, mac1, mac2) {
282282

283283
return mac1 === mac2;
284284
}
285-
286-
} // end module implementation
287-
288-
/* ########## Begin module wrapper ########## */
289-
var name = 'aesCipherSuites';
290-
if(typeof define !== 'function') {
291-
// NodeJS -> AMD
292-
if(typeof module === 'object' && module.exports) {
293-
var nodeJS = true;
294-
define = function(ids, factory) {
295-
factory(require, module);
296-
};
297-
} else {
298-
// <script>
299-
if(typeof forge === 'undefined') {
300-
forge = {};
301-
}
302-
return initModule(forge);
303-
}
304-
}
305-
// AMD
306-
var deps;
307-
var defineFunc = function(require, module) {
308-
module.exports = function(forge) {
309-
var mods = deps.map(function(dep) {
310-
return require(dep);
311-
}).concat(initModule);
312-
// handle circular dependencies
313-
forge = forge || {};
314-
forge.defined = forge.defined || {};
315-
if(forge.defined[name]) {
316-
return forge[name];
317-
}
318-
forge.defined[name] = true;
319-
for(var i = 0; i < mods.length; ++i) {
320-
mods[i](forge);
321-
}
322-
return forge[name];
323-
};
324-
};
325-
var tmpDefine = define;
326-
define = function(ids, factory) {
327-
deps = (typeof ids === 'string') ? factory.slice(2) : ids.slice(2);
328-
if(nodeJS) {
329-
delete define;
330-
return tmpDefine.apply(null, Array.prototype.slice.call(arguments, 0));
331-
}
332-
define = tmpDefine;
333-
return define.apply(null, Array.prototype.slice.call(arguments, 0));
334-
};
335-
define(['require', 'module', './aes', './tls'], function() {
336-
defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
337-
});
338-
})();

‎lib/asn1.js

Lines changed: 4 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,12 @@
133133
* The full OID (including ASN.1 tag and length of 6 bytes) is:
134134
* 0x06062A864886F70D
135135
*/
136-
(function() {
137-
/* ########## Begin module implementation ########## */
138-
function initModule(forge) {
136+
var forge = require('./forge');
137+
require('./util');
138+
require('./oids')
139139

140140
/* ASN.1 API */
141-
var asn1 = forge.asn1 = forge.asn1 || {};
141+
var asn1 = module.exports = forge.asn1 = forge.asn1 || {};
142142

143143
/**
144144
* ASN.1 classes.
@@ -1113,57 +1113,3 @@ asn1.prettyPrint = function(obj, level, indentation) {
11131113

11141114
return rval;
11151115
};
1116-
1117-
} // end module implementation
1118-
1119-
/* ########## Begin module wrapper ########## */
1120-
var name = 'asn1';
1121-
if(typeof define !== 'function') {
1122-
// NodeJS -> AMD
1123-
if(typeof module === 'object' && module.exports) {
1124-
var nodeJS = true;
1125-
define = function(ids, factory) {
1126-
factory(require, module);
1127-
};
1128-
} else {
1129-
// <script>
1130-
if(typeof forge === 'undefined') {
1131-
forge = {};
1132-
}
1133-
return initModule(forge);
1134-
}
1135-
}
1136-
// AMD
1137-
var deps;
1138-
var defineFunc = function(require, module) {
1139-
module.exports = function(forge) {
1140-
var mods = deps.map(function(dep) {
1141-
return require(dep);
1142-
}).concat(initModule);
1143-
// handle circular dependencies
1144-
forge = forge || {};
1145-
forge.defined = forge.defined || {};
1146-
if(forge.defined[name]) {
1147-
return forge[name];
1148-
}
1149-
forge.defined[name] = true;
1150-
for(var i = 0; i < mods.length; ++i) {
1151-
mods[i](forge);
1152-
}
1153-
return forge[name];
1154-
};
1155-
};
1156-
var tmpDefine = define;
1157-
define = function(ids, factory) {
1158-
deps = (typeof ids === 'string') ? factory.slice(2) : ids.slice(2);
1159-
if(nodeJS) {
1160-
delete define;
1161-
return tmpDefine.apply(null, Array.prototype.slice.call(arguments, 0));
1162-
}
1163-
define = tmpDefine;
1164-
return define.apply(null, Array.prototype.slice.call(arguments, 0));
1165-
};
1166-
define(['require', 'module', './util', './oids'], function() {
1167-
defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
1168-
});
1169-
})();

‎lib/cipher.js

Lines changed: 3 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
*
66
* Copyright (c) 2010-2014 Digital Bazaar, Inc.
77
*/
8-
(function() {
9-
/* ########## Begin module implementation ########## */
10-
function initModule(forge) {
8+
var forge = require('./forge');
9+
require('./util');
1110

12-
forge.cipher = forge.cipher || {};
11+
module.exports = forge.cipher = forge.cipher || {};
1312

1413
// registered algorithms
1514
forge.cipher.algorithms = forge.cipher.algorithms || {};
@@ -229,58 +228,3 @@ BlockCipher.prototype.finish = function(pad) {
229228

230229
return true;
231230
};
232-
233-
234-
} // end module implementation
235-
236-
/* ########## Begin module wrapper ########## */
237-
var name = 'cipher';
238-
if(typeof define !== 'function') {
239-
// NodeJS -> AMD
240-
if(typeof module === 'object' && module.exports) {
241-
var nodeJS = true;
242-
define = function(ids, factory) {
243-
factory(require, module);
244-
};
245-
} else {
246-
// <script>
247-
if(typeof forge === 'undefined') {
248-
forge = {};
249-
}
250-
return initModule(forge);
251-
}
252-
}
253-
// AMD
254-
var deps;
255-
var defineFunc = function(require, module) {
256-
module.exports = function(forge) {
257-
var mods = deps.map(function(dep) {
258-
return require(dep);
259-
}).concat(initModule);
260-
// handle circular dependencies
261-
forge = forge || {};
262-
forge.defined = forge.defined || {};
263-
if(forge.defined[name]) {
264-
return forge[name];
265-
}
266-
forge.defined[name] = true;
267-
for(var i = 0; i < mods.length; ++i) {
268-
mods[i](forge);
269-
}
270-
return forge[name];
271-
};
272-
};
273-
var tmpDefine = define;
274-
define = function(ids, factory) {
275-
deps = (typeof ids === 'string') ? factory.slice(2) : ids.slice(2);
276-
if(nodeJS) {
277-
delete define;
278-
return tmpDefine.apply(null, Array.prototype.slice.call(arguments, 0));
279-
}
280-
define = tmpDefine;
281-
return define.apply(null, Array.prototype.slice.call(arguments, 0));
282-
};
283-
define(['require', 'module', './util'], function() {
284-
defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
285-
});
286-
})();

‎lib/cipherModes.js

Lines changed: 3 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@
55
*
66
* Copyright (c) 2010-2014 Digital Bazaar, Inc.
77
*/
8-
(function() {
9-
/* ########## Begin module implementation ########## */
10-
function initModule(forge) {
8+
var forge = require('./forge');
9+
require('./util')
1110

1211
forge.cipher = forge.cipher || {};
1312

1413
// supported cipher modes
15-
var modes = forge.cipher.modes = forge.cipher.modes || {};
16-
14+
var modes = module.exports = forge.cipher.modes = forge.cipher.modes || {};
1715

1816
/** Electronic codebook (ECB) (Don't use this; it's not secure) **/
1917

@@ -992,58 +990,3 @@ function from64To32(num) {
992990
// convert 64-bit number to two BE Int32s
993991
return [(num / 0x100000000) | 0, num & 0xFFFFFFFF];
994992
}
995-
996-
997-
} // end module implementation
998-
999-
/* ########## Begin module wrapper ########## */
1000-
var name = 'cipherModes';
1001-
if(typeof define !== 'function') {
1002-
// NodeJS -> AMD
1003-
if(typeof module === 'object' && module.exports) {
1004-
var nodeJS = true;
1005-
define = function(ids, factory) {
1006-
factory(require, module);
1007-
};
1008-
} else {
1009-
// <script>
1010-
if(typeof forge === 'undefined') {
1011-
forge = {};
1012-
}
1013-
return initModule(forge);
1014-
}
1015-
}
1016-
// AMD
1017-
var deps;
1018-
var defineFunc = function(require, module) {
1019-
module.exports = function(forge) {
1020-
var mods = deps.map(function(dep) {
1021-
return require(dep);
1022-
}).concat(initModule);
1023-
// handle circular dependencies
1024-
forge = forge || {};
1025-
forge.defined = forge.defined || {};
1026-
if(forge.defined[name]) {
1027-
return forge[name];
1028-
}
1029-
forge.defined[name] = true;
1030-
for(var i = 0; i < mods.length; ++i) {
1031-
mods[i](forge);
1032-
}
1033-
return forge[name];
1034-
};
1035-
};
1036-
var tmpDefine = define;
1037-
define = function(ids, factory) {
1038-
deps = (typeof ids === 'string') ? factory.slice(2) : ids.slice(2);
1039-
if(nodeJS) {
1040-
delete define;
1041-
return tmpDefine.apply(null, Array.prototype.slice.call(arguments, 0));
1042-
}
1043-
define = tmpDefine;
1044-
return define.apply(null, Array.prototype.slice.call(arguments, 0));
1045-
};
1046-
define(['require', 'module', './util'], function() {
1047-
defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
1048-
});
1049-
})();

0 commit comments

Comments
 (0)