From 33fad83c72b44aa3ebb8143e607c8bcde175442b Mon Sep 17 00:00:00 2001 From: "Eduardo' Vela\" Nava (sirdarckcat)" Date: Mon, 27 Feb 2017 21:30:58 +0100 Subject: [PATCH 1/3] Create new e2e.cipher.deprecated This will include deprecated ciphers. --- .../e2e/algorithm/deprecated_ciphers.js | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/javascript/crypto/e2e/algorithm/deprecated_ciphers.js diff --git a/src/javascript/crypto/e2e/algorithm/deprecated_ciphers.js b/src/javascript/crypto/e2e/algorithm/deprecated_ciphers.js new file mode 100644 index 00000000..1e2b1070 --- /dev/null +++ b/src/javascript/crypto/e2e/algorithm/deprecated_ciphers.js @@ -0,0 +1,30 @@ +/** + * @license + * Copyright 2017 Google Inc. All rights reserved. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @fileoverview Requires deprecated ciphers () to load them into the factory. + */ +/** @suppress {extraProvide} this aggregation needs a namespace */ +goog.provide('e2e.cipher.deprecated'); + +/** @suppress {extraRequire} intentional import */ +goog.require('e2e.cipher.Blowfish'); +/** @suppress {extraRequire} intentional import */ +goog.require('e2e.cipher.Cast5'); +/** @suppress {extraRequire} intentional import */ +goog.require('e2e.cipher.Des'); +/** @suppress {extraRequire} intentional import */ +goog.require('e2e.cipher.TripleDes'); From 04450f28cd4a7899a5e04da524a4ec67e41249ce Mon Sep 17 00:00:00 2001 From: "Eduardo' Vela\" Nava (sirdarckcat)" Date: Mon, 27 Feb 2017 21:32:19 +0100 Subject: [PATCH 2/3] Remove deprecated ciphers from .all --- src/javascript/crypto/e2e/algorithm/all_ciphers.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/javascript/crypto/e2e/algorithm/all_ciphers.js b/src/javascript/crypto/e2e/algorithm/all_ciphers.js index 31de11bb..d147b939 100644 --- a/src/javascript/crypto/e2e/algorithm/all_ciphers.js +++ b/src/javascript/crypto/e2e/algorithm/all_ciphers.js @@ -23,20 +23,10 @@ goog.provide('e2e.cipher.all'); /** @suppress {extraRequire} intentional import */ goog.require('e2e.cipher.Aes'); /** @suppress {extraRequire} intentional import */ -goog.require('e2e.cipher.Blowfish'); -/** @suppress {extraRequire} intentional import */ -goog.require('e2e.cipher.Cast5'); -/** @suppress {extraRequire} intentional import */ -goog.require('e2e.cipher.Des'); -/** @suppress {extraRequire} intentional import */ goog.require('e2e.cipher.Ecdh'); /** @suppress {extraRequire} intentional import */ goog.require('e2e.cipher.ElGamal'); /** @suppress {extraRequire} intentional import */ -goog.require('e2e.cipher.Idea'); -/** @suppress {extraRequire} intentional import */ goog.require('e2e.cipher.Rsa'); /** @suppress {extraRequire} intentional import */ goog.require('e2e.cipher.RsaEncrypt'); -/** @suppress {extraRequire} intentional import */ -goog.require('e2e.cipher.TripleDes'); From 476c544b6de980d047329aa23e7276110f4d4424 Mon Sep 17 00:00:00 2001 From: "Eduardo' Vela\" Nava (sirdarckcat)" Date: Mon, 27 Feb 2017 21:33:33 +0100 Subject: [PATCH 3/3] Add IDEA back to deprecated ciphers --- src/javascript/crypto/e2e/algorithm/deprecated_ciphers.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/javascript/crypto/e2e/algorithm/deprecated_ciphers.js b/src/javascript/crypto/e2e/algorithm/deprecated_ciphers.js index 1e2b1070..5b30880a 100644 --- a/src/javascript/crypto/e2e/algorithm/deprecated_ciphers.js +++ b/src/javascript/crypto/e2e/algorithm/deprecated_ciphers.js @@ -27,4 +27,6 @@ goog.require('e2e.cipher.Cast5'); /** @suppress {extraRequire} intentional import */ goog.require('e2e.cipher.Des'); /** @suppress {extraRequire} intentional import */ +goog.require('e2e.cipher.Idea'); +/** @suppress {extraRequire} intentional import */ goog.require('e2e.cipher.TripleDes');