Because of recent semver-major changes that couldn't make it to Node 10, almost every new change to crypto code now has conflicts. Here is the list of commits that need to be backported: * [358d8ffad6] - (SEMVER-MINOR) crypto: allow to restrict valid GCM tag length (Tobias Nießen) https://github.com/nodejs/node/pull/20039 * [c851263023] - crypto: add createCipher/WithIV functions (Daniel Bevenius) https://github.com/nodejs/node/pull/20164 * [d024c2cda1] - crypto: add addCipherPrototypeFunctions function (Daniel Bevenius) https://github.com/nodejs/node/pull/20164 * [9f97f1044b] - crypto: remove rsaPrivate and rename rsaPublic (Daniel Bevenius) https://github.com/nodejs/node/pull/20164 * [15fd0d95f8] - src: fix node_crypto.cc compiler warnings (Daniel Bevenius) https://github.com/nodejs/node/pull/20216 * [c521a20f43] - test: remove crypto.DEFAULT_ENCODING usage (Daniel Bevenius) https://github.com/nodejs/node/pull/20221 * [4809db9317] - crypto: use kNoAuthTagLength in InitAuthenticated (Tobias Nießen) https://github.com/nodejs/node/pull/20225 * [9d35f696e8] - crypto: add using directives for v8::Int32, Uint32 (Tobias Nießen) https://github.com/nodejs/node/pull/20225 * [f9b9974f55] - (SEMVER-MINOR) crypto: support authTagLength in GCM encryption (Tobias Nießen) https://github.com/nodejs/node/pull/20235 * [f7cdeba548] - crypto: allocate more memory for cipher.update() (Yihong Wang) https://github.com/nodejs/node/pull/20370 * [d7cba76856] - src: more automatic memory management in node_crypto.cc (Anna Henningsen) https://github.com/nodejs/node/pull/20238 * [e3ceae724c] - crypto: add test case for AES key wrapping (Yihong Wang) https://github.com/nodejs/node/pull/20587 /cc @nodejs/crypto
Because of recent semver-major changes that couldn't make it to Node 10, almost every new change to crypto code now has conflicts.
Here is the list of commits that need to be backported:
/cc @nodejs/crypto