DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Rename AttemptSaplingEncDecryptionUsingFullViewingKey and use function overloading.

Browse Source
This commit is contained in:
Simon
2018-07-23 10:48:26 -07:00
parent 7b913c3e5e
commit e739ca2ef2
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtest/test_noteencryption.cpp
View File

@@ -113,7 +113,7 @@ TEST(noteencryption, NotePlaintext)
ASSERT_TRUE(decrypted_out_ct_unwrapped.esk == out_pt.esk); ASSERT_TRUE(decrypted_out_ct_unwrapped.esk == out_pt.esk);
// Test sender can decrypt the note ciphertext. // Test sender can decrypt the note ciphertext.
foo = SaplingNotePlaintext::decryptUsingFullViewingKey( foo = SaplingNotePlaintext::decrypt(
ct, ct,
epk, epk,
decrypted_out_ct_unwrapped.esk, decrypted_out_ct_unwrapped.esk,

4
src/zcash/Note.cpp
View File

@@ -208,14 +208,14 @@ boost::optional<SaplingNotePlaintext> SaplingNotePlaintext::decrypt(
return ret; return ret;
} }
boost::optional<SaplingNotePlaintext> SaplingNotePlaintext::decryptUsingFullViewingKey( boost::optional<SaplingNotePlaintext> SaplingNotePlaintext::decrypt(
const SaplingEncCiphertext &ciphertext, const SaplingEncCiphertext &ciphertext,
const uint256 &epk, const uint256 &epk,
const uint256 &esk, const uint256 &esk,
const uint256 &pk_d const uint256 &pk_d
) )
{ {
auto pt = AttemptSaplingEncDecryptionUsingFullViewingKey(ciphertext, epk, esk, pk_d); auto pt = AttemptSaplingEncDecryption(ciphertext, epk, esk, pk_d);
if (!pt) { if (!pt) {
return boost::none; return boost::none;
} }

2
src/zcash/Note.hpp
View File

@@ -133,7 +133,7 @@ public:
const uint256 &epk const uint256 &epk
); );
static boost::optional<SaplingNotePlaintext> decryptUsingFullViewingKey( static boost::optional<SaplingNotePlaintext> decrypt(
const SaplingEncCiphertext &ciphertext, const SaplingEncCiphertext &ciphertext,
const uint256 &epk, const uint256 &epk,
const uint256 &esk, const uint256 &esk,

2
src/zcash/NoteEncryption.cpp
View File

@@ -187,7 +187,7 @@ boost::optional<SaplingEncPlaintext> AttemptSaplingEncDecryption(
return plaintext; return plaintext;
} }
boost::optional<SaplingEncPlaintext> AttemptSaplingEncDecryptionUsingFullViewingKey ( boost::optional<SaplingEncPlaintext> AttemptSaplingEncDecryption (
const SaplingEncCiphertext &ciphertext, const SaplingEncCiphertext &ciphertext,
const uint256 &epk, const uint256 &epk,
const uint256 &esk, const uint256 &esk,

4
src/zcash/NoteEncryption.hpp
View File

@@ -73,9 +73,9 @@ boost::optional<SaplingEncPlaintext> AttemptSaplingEncDecryption(
const uint256 &epk const uint256 &epk
); );
// Attempts to decrypt a Sapling note using full viewing key. // Attempts to decrypt a Sapling note using outgoing plaintext.
// This will not check that the contents of the ciphertext are correct. // This will not check that the contents of the ciphertext are correct.
boost::optional<SaplingEncPlaintext> AttemptSaplingEncDecryptionUsingFullViewingKey ( boost::optional<SaplingEncPlaintext> AttemptSaplingEncDecryption (
const SaplingEncCiphertext &ciphertext, const SaplingEncCiphertext &ciphertext,
const uint256 &epk, const uint256 &epk,
const uint256 &esk, const uint256 &esk,