Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-10-31 08:20:37 +01:00
Code Issues Projects Releases Wiki Activity

generate keypair on registration

Browse Source
This commit is contained in:
Kyle Spearrin 2017-02-20 23:59:12 -05:00
parent 24862f31b3
commit 086d924f06
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/app/accounts/accountsRegisterController.js
View File

@ -28,16 +28,27 @@ angular
var email = $scope.model.email.toLowerCase();
var key = cryptoService.makeKey($scope.model.masterPassword, email);
var request = {
name: $scope.model.name,
email: email,
masterPasswordHash: cryptoService.hashPassword($scope.model.masterPassword, key),
masterPasswordHint: $scope.model.masterPasswordHint
};
cryptoService.makeKeyPair(key, function (publicKey, privateKeyEnc, errors) {
if (errors) {
validationService.addError(form, null, 'Problem generating keys.', true);
return;
}
$scope.registerPromise = apiService.accounts.register(request, function () {
$scope.success = true;
$analytics.eventTrack('Registered');
}).$promise;
var request = {
name: $scope.model.name,
email: email,
masterPasswordHash: cryptoService.hashPassword($scope.model.masterPassword, key),
masterPasswordHint: $scope.model.masterPasswordHint,
keys: {
publicKey: publicKey,
encryptedPrivateKey: privateKeyEnc
}
};
$scope.registerPromise = apiService.accounts.register(request, function () {
$scope.success = true;
$analytics.eventTrack('Registered');
}).$promise;
});
};
});

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

@ -90,7 +90,7 @@ angular
return key;
};
_service.makeKeyPair = function (callback) {
_service.makeKeyPair = function (key, callback) {
forge.pki.rsa.generateKeyPair({ bits: 2048, workers: 2 }, function (error, keypair) {
if (error) {
callback(null, null, error);
@ -99,11 +99,12 @@ angular
var privateKey = forge.pki.privateKeyToAsn1(keypair.privateKey);
var privateKeyBytes = forge.asn1.toDer(privateKey).getBytes();
var privateKeyEnc = _service.encrypt(privateKeyBytes, key, 'raw');
var publicKey = forge.pki.publicKeyToAsn1(keypair.publicKey);
var publicKeyBytes = forge.asn1.toDer(publicKey).getBytes();
callback(privateKeyBytes, publicKeyBytes, null);
callback(forge.util.encode64(publicKeyBytes), privateKeyEnc, null);
});
};