Skip to content

Fix for wrong letter case of CONCAT algorithm name #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bryandel wants to merge 3 commits into from
Closed

Fix for wrong letter case of CONCAT algorithm name #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2494a3
Fix for wrong letter casing of CONCAT algorithm name
bryandel Mar 16, 2021
a301003
Merge branch 'master' of https://github.com/microsoft/MSR-JavaScript-…
bryandel May 19, 2021
74d7e08
Bump 1.6.4
bryandel May 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/msrcrypto.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
//*******************************************************************************
"use strict";

var msrCryptoVersion = "1.6.3";
var msrCryptoVersion = "1.6.4";

(function(root, factory) {

Expand Down Expand Up @@ -7333,8 +7333,8 @@ var msrCryptoVersion = "1.6.3";

};

operations.register("deriveKey", "concat", msrcryptoKdf.deriveKey);
operations.register("deriveBits", "concat", msrcryptoKdf.deriveBits);
operations.register("deriveKey", "CONCAT", msrcryptoKdf.deriveKey);
operations.register("deriveBits", "CONCAT", msrcryptoKdf.deriveBits);

}

Expand Down
2 changes: 1 addition & 1 deletion lib/msrcrypto.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/msrcrypto",
"version": "1.6.3",
"version": "1.6.4",
"description": "MSR JavaScript Cryptography Library",
"license": "Apache-2.0",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion scripts/bundleHead.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

"use strict";

var msrCryptoVersion = "1.6.3";
var msrCryptoVersion = "1.6.4";

// UMD wrapper
(function(root, factory) {
Expand Down
4 changes: 2 additions & 2 deletions scripts/kdf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ if (typeof operations !== "undefined") {

};

operations.register("deriveKey", "concat", msrcryptoKdf.deriveKey);
operations.register("deriveBits", "concat", msrcryptoKdf.deriveBits);
operations.register("deriveKey", "CONCAT", msrcryptoKdf.deriveKey);
operations.register("deriveBits", "CONCAT", msrcryptoKdf.deriveBits);

}