Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
diff --cc src/node_crypto.cc
index ae4b67e,0495432..0000000
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@@ -4700,10 -4506,8 +4698,15 @@@ void InitCrypto(Handle<Object> target)
Verify::Initialize(target);
NODE_SET_METHOD(target, "PBKDF2", PBKDF2);
++<<<<<<< HEAD
+ NODE_SET_METHOD(target, "randomBytes", RandomBytes<RAND_bytes>);
+ NODE_SET_METHOD(target, "pseudoRandomBytes", RandomBytes<RAND_pseudo_bytes>);
+ NODE_SET_METHOD(target, "getCiphers", GetCiphers);
+ NODE_SET_METHOD(target, "getHashes", GetHashes);
++=======
+ NODE_SET_METHOD(target, "randomBytes", RandomBytes<false>);
+ NODE_SET_METHOD(target, "pseudoRandomBytes", RandomBytes<true>);
++>>>>>>> origin/v0.8
subject_symbol = NODE_PSYMBOL("subject");
issuer_symbol = NODE_PSYMBOL("issuer");
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.