mirror of
https://github.com/monero-project/monero.git
synced 2024-12-26 11:09:26 -05:00
Merge pull request #6155
d8fc8d8
make d2h et al. constant-time (jtgrassie)
This commit is contained in:
commit
f971068363
@ -31,6 +31,7 @@
|
||||
#include "misc_log_ex.h"
|
||||
#include "cryptonote_config.h"
|
||||
#include "rctTypes.h"
|
||||
#include "int-util.h"
|
||||
using namespace crypto;
|
||||
using namespace std;
|
||||
|
||||
@ -118,40 +119,22 @@ namespace rct {
|
||||
//uint long long to 32 byte key
|
||||
void d2h(key & amounth, const xmr_amount in) {
|
||||
sc_0(amounth.bytes);
|
||||
xmr_amount val = in;
|
||||
int i = 0;
|
||||
while (val != 0) {
|
||||
amounth[i] = (unsigned char)(val & 0xFF);
|
||||
i++;
|
||||
val /= (xmr_amount)256;
|
||||
}
|
||||
memcpy_swap64le(amounth.bytes, &in, 1);
|
||||
}
|
||||
|
||||
//uint long long to 32 byte key
|
||||
key d2h(const xmr_amount in) {
|
||||
key amounth;
|
||||
sc_0(amounth.bytes);
|
||||
xmr_amount val = in;
|
||||
int i = 0;
|
||||
while (val != 0) {
|
||||
amounth[i] = (unsigned char)(val & 0xFF);
|
||||
i++;
|
||||
val /= (xmr_amount)256;
|
||||
}
|
||||
d2h(amounth, in);
|
||||
return amounth;
|
||||
}
|
||||
|
||||
//uint long long to int[64]
|
||||
void d2b(bits amountb, xmr_amount val) {
|
||||
int i = 0;
|
||||
while (val != 0) {
|
||||
amountb[i] = val & 1;
|
||||
i++;
|
||||
val >>= 1;
|
||||
}
|
||||
while (i < 64) {
|
||||
amountb[i] = 0;
|
||||
i++;
|
||||
amountb[i++] = val & 1;
|
||||
val >>= 1;
|
||||
}
|
||||
}
|
||||
|
||||
@ -172,16 +155,11 @@ namespace rct {
|
||||
int val = 0, i = 0, j = 0;
|
||||
for (j = 0; j < 8; j++) {
|
||||
val = (unsigned char)test.bytes[j];
|
||||
i = 8 * j;
|
||||
while (val != 0) {
|
||||
amountb2[i] = val & 1;
|
||||
i++;
|
||||
i = 0;
|
||||
while (i < 8) {
|
||||
amountb2[j*8+i++] = val & 1;
|
||||
val >>= 1;
|
||||
}
|
||||
while (i < 8 * (j + 1)) {
|
||||
amountb2[i] = 0;
|
||||
i++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user