Skip to content

Commit a882d10

Browse files
authored
Merge pull request github#14 from microsoft/fix-raw-import-bad-references
fix bad references; update packages; update version
2 parents 9837453 + 19b9a06 commit a882d10

File tree

8 files changed

+5007
-185
lines changed

8 files changed

+5007
-185
lines changed

lib/msrcrypto.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
//*******************************************************************************
1818
"use strict";
1919

20-
var msrCryptoVersion = "1.6.4";
20+
var msrCryptoVersion = "1.6.5";
2121

2222
(function(root, factory) {
2323

@@ -7828,7 +7828,7 @@ var msrCryptoVersion = "1.6.4";
78287828
},
78297829
keyHandle: {
78307830
algorithm: p.algorithm,
7831-
extractable: p.extractable || keyObject.extractable,
7831+
extractable: p.extractable || false,
78327832
usages: p.usages,
78337833
type: "public"
78347834
}
@@ -8154,7 +8154,7 @@ var msrCryptoVersion = "1.6.4";
81548154
},
81558155
keyHandle: {
81568156
algorithm: p.algorithm,
8157-
extractable: p.extractable || keyObject.extractable,
8157+
extractable: p.extractable || false,
81588158
usages: p.usages,
81598159
type: "public"
81608160
}
@@ -8348,21 +8348,21 @@ var msrCryptoVersion = "1.6.4";
83488348
return result.keyHandle;
83498349
}
83508350

8351-
case "keyExport":
8352-
return result.keyHandle;
8353-
8354-
case "keyPairGeneration":
8355-
privateKey = result.keyPair.privateKey;
8356-
publicKey = result.keyPair.publicKey;
8357-
keys.add(publicKey.keyHandle, publicKey.keyData);
8358-
keys.add(privateKey.keyHandle, privateKey.keyData);
8359-
return {
8360-
publicKey: publicKey.keyHandle,
8361-
privateKey: privateKey.keyHandle
8362-
};
8351+
case "keyExport":
8352+
return result.keyHandle;
8353+
8354+
case "keyPairGeneration":
8355+
privateKey = result.keyPair.privateKey;
8356+
publicKey = result.keyPair.publicKey;
8357+
keys.add(publicKey.keyHandle, publicKey.keyData);
8358+
keys.add(privateKey.keyHandle, privateKey.keyData);
8359+
return {
8360+
publicKey: publicKey.keyHandle,
8361+
privateKey: privateKey.keyHandle
8362+
};
83638363

8364-
default:
8365-
throw new Error("Unknown key operation");
8364+
default:
8365+
throw new Error("Unknown key operation");
83668366
}
83678367
}
83688368

lib/msrcrypto.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)