Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-26 17:08:33 +01:00
Code Issues Projects Releases Wiki Activity

primary worker for forge key generation

Browse Source
This commit is contained in:
Kyle Spearrin 2017-05-15 20:58:16 -04:00
parent 933cbb72aa
commit 3e0ce5544c
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gulpfile.js
View File

@ -158,6 +158,10 @@ gulp.task('lib', ['clean:lib'], function () {
src: paths.npmDir + 'clipboard/dist/clipboard*.js', src: paths.npmDir + 'clipboard/dist/clipboard*.js',
dest: paths.libDir + 'clipboard' dest: paths.libDir + 'clipboard'
}, },
{
src: paths.npmDir + 'node-forge/dist/prime.worker.*',
dest: paths.libDir + 'forge'
},
{ {
src: [ src: [
paths.npmDir + 'angulartics-google-analytics/lib/angulartics*.js', paths.npmDir + 'angulartics-google-analytics/lib/angulartics*.js',
@ -293,6 +297,10 @@ gulp.task('dist:move', function () {
src: paths.npmDir + 'angular/angular.min.js', src: paths.npmDir + 'angular/angular.min.js',
dest: paths.dist + 'lib/angular' dest: paths.dist + 'lib/angular'
}, },
{
src: paths.npmDir + 'node-forge/dist/prime.worker.*',
dest: paths.dist + 'lib/forge'
},
{ {
src: [ src: [
paths.webroot + '**/app/**/*.html', paths.webroot + '**/app/**/*.html',

6
src/app/services/cryptoService.js
View File

@ -209,7 +209,11 @@ angular
_service.makeKeyPair = function (key) { _service.makeKeyPair = function (key) {
var deferred = $q.defer(); var deferred = $q.defer();
forge.pki.rsa.generateKeyPair({ bits: 2048, workers: 2 }, function (error, keypair) { forge.pki.rsa.generateKeyPair({
bits: 2048,
workers: 2,
workerScript: '/lib/forge/prime.worker.min.js'
}, function (error, keypair) {
if (error) { if (error) {
deferred.reject(error); deferred.reject(error);
return; return;