bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 16:53:34 +00:00
Code Issues Releases Wiki Activity

rename some crypto terms

Browse Source
This commit is contained in:
Kyle Spearrin
2018-05-09 16:00:15 -04:00
parent 22894a6876
commit 29556c5d3b
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/models/domain/cipherString.ts
View File

@@ -6,15 +6,15 @@ export class CipherString {
encryptedString?: string;
encryptionType?: EncryptionType;
decryptedValue?: string;
cipherText?: string;
initializationVector?: string;
data?: string;
iv?: string;
mac?: string;
constructor(encryptedStringOrType: string | EncryptionType, ct?: string, iv?: string, mac?: string) {
if (ct != null) {
// ct and header
constructor(encryptedStringOrType: string | EncryptionType, data?: string, iv?: string, mac?: string) {
if (data != null) {
// data and header
const encType = encryptedStringOrType as EncryptionType;
this.encryptedString = encType + '.' + ct;
this.encryptedString = encType + '.' + data;
// iv
if (iv != null) {
@@ -27,8 +27,8 @@ export class CipherString {
}
this.encryptionType = encType;
this.cipherText = ct;
this.initializationVector = iv;
this.data = data;
this.iv = iv;
this.mac = mac;
return;
@@ -62,8 +62,8 @@ export class CipherString {
return;
}
this.initializationVector = encPieces[0];
this.cipherText = encPieces[1];
this.iv = encPieces[0];
this.data = encPieces[1];
this.mac = encPieces[2];
break;
case EncryptionType.AesCbc256_B64:
@@ -71,8 +71,8 @@ export class CipherString {
return;
}
this.initializationVector = encPieces[0];
this.cipherText = encPieces[1];
this.iv = encPieces[0];
this.data = encPieces[1];
break;
case EncryptionType.Rsa2048_OaepSha256_B64:
case EncryptionType.Rsa2048_OaepSha1_B64:
@@ -80,7 +80,7 @@ export class CipherString {
return;
}
this.cipherText = encPieces[0];
this.data = encPieces[0];
break;
default:
return;

2
src/models/domain/encryptedObject.ts
View File

@@ -2,7 +2,7 @@ import { SymmetricCryptoKey } from './symmetricCryptoKey';
export class EncryptedObject {
iv: ArrayBuffer;
ct: ArrayBuffer;
data: ArrayBuffer;
mac: ArrayBuffer;
key: SymmetricCryptoKey;
}