diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-03-04 14:58:45 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-03-04 14:58:45 +0200 |
| commit | 8c53ac2dd156db87a0e7d1c354131cf158e364a3 (patch) | |
| tree | 119c52f92f4b4eace8adf8a2baf437856fa8d206 /src/device/log.cpp | |
| parent | 194c4c0bcb9f308e7e5543bd06b829eb8dea38df (diff) | |
| parent | 2dbc487ec08e0466419cecb25a7f2919f02b5177 (diff) | |
| download | monzero-core-8c53ac2dd156db87a0e7d1c354131cf158e364a3.tar.gz monzero-core-8c53ac2dd156db87a0e7d1c354131cf158e364a3.tar.xz monzero-core-8c53ac2dd156db87a0e7d1c354131cf158e364a3.zip | |
Merge pull request #5132
2dbc487e Add support for V10 protocol with BulletProofV2 and short amount. (cslashm)
63cc02c0 Fix dummy decryption in debug mode (cslashm)
f0e55ceb fix log namespace (cslashm)
460da140 New scheme key destination contrfol (cslashm)
Diffstat (limited to 'src/device/log.cpp')
| -rw-r--r-- | src/device/log.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/device/log.cpp b/src/device/log.cpp index c9d3b551b..87505798b 100644 --- a/src/device/log.cpp +++ b/src/device/log.cpp @@ -66,7 +66,7 @@ namespace hw { void decrypt(char* buf, size_t len) { - #ifdef IODUMMYCRYPT_HWDEVICE + #if defined(IODUMMYCRYPT_HWDEVICE) || defined(IONOCRYPT_HWDEVICE) size_t i; if (len == 32) { //view key? @@ -86,11 +86,13 @@ namespace hw { return; } } + #if defined(IODUMMYCRYPT_HWDEVICE) //std decrypt: XOR.55h for (i = 0; i<len;i++) { buf[i] ^= 0x55; } #endif + #endif } crypto::key_derivation decrypt(const crypto::key_derivation &derivation) { |