frost/secp256k1-zkp
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge ElementsProject/secp256k1-zkp#194: extrakeys: rename swap/swap64 to fix OpenBSD 7.1 compilation

Browse Source 
db648478c3cc600dbe42c5badb45a1e1fa217f13 extrakeys: rename swap/swap64 to fix OpenBSD 7.1 compilation (Jon Griffiths)

Pull request description:

  OpenBSD defines swap64 in <endian.h>.

ACKs for top commit:
  real-or-random:
    ACK db648478c3cc600dbe42c5badb45a1e1fa217f13
  jonasnick:
    ACK db648478c3cc600dbe42c5badb45a1e1fa217f13

Tree-SHA512: a3bf4175918c06457ec941eb029fded98d367c82a352024a9f96919219cc494e40f96e090dc03b73d0d22b99374f0656f27b755a56caebcd5df27efbd978fd56
This commit is contained in:
Tim Ruffing 2022-07-20 21:00:10 +02:00
commit 71a206fa5b
No known key found for this signature in database
GPG Key ID: 8C461CCD293F6011
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/extrakeys/hsort_impl.h
View File

@ -23,7 +23,7 @@ static SECP256K1_INLINE size_t child2(size_t i) {
return child1(i)+1; return child1(i)+1;
} }
static SECP256K1_INLINE void swap64(unsigned char *a, size_t i, size_t j, size_t stride) { static SECP256K1_INLINE void heap_swap64(unsigned char *a, size_t i, size_t j, size_t stride) {
unsigned char tmp[64]; unsigned char tmp[64];
VERIFY_CHECK(stride <= 64); VERIFY_CHECK(stride <= 64);
memcpy(tmp, a + i*stride, stride); memcpy(tmp, a + i*stride, stride);
@ -31,12 +31,12 @@ static SECP256K1_INLINE void swap64(unsigned char *a, size_t i, size_t j, size_t
memcpy(a + j*stride, tmp, stride); memcpy(a + j*stride, tmp, stride);
} }
static SECP256K1_INLINE void swap(unsigned char *a, size_t i, size_t j, size_t stride) { static SECP256K1_INLINE void heap_swap(unsigned char *a, size_t i, size_t j, size_t stride) {
while (64 < stride) { while (64 < stride) {
swap64(a + (stride - 64), i, j, 64); heap_swap64(a + (stride - 64), i, j, 64);
stride -= 64; stride -= 64;
} }
swap64(a, i, j, stride); heap_swap64(a, i, j, stride);
} }
static SECP256K1_INLINE void heap_down(unsigned char *a, size_t i, size_t heap_size, size_t stride, static SECP256K1_INLINE void heap_down(unsigned char *a, size_t i, size_t heap_size, size_t stride,
@ -71,7 +71,7 @@ static SECP256K1_INLINE void heap_down(unsigned char *a, size_t i, size_t heap_s
if (child2(i) < heap_size if (child2(i) < heap_size
&& 0 <= cmp(a + child2(i)*stride, a + child1(i)*stride, cmp_data)) { && 0 <= cmp(a + child2(i)*stride, a + child1(i)*stride, cmp_data)) {
if (0 < cmp(a + child2(i)*stride, a + i*stride, cmp_data)) { if (0 < cmp(a + child2(i)*stride, a + i*stride, cmp_data)) {
swap(a, i, child2(i), stride); heap_swap(a, i, child2(i), stride);
i = child2(i); i = child2(i);
} else { } else {
/* At this point we have [child2(i)] >= [child1(i)] and we have /* At this point we have [child2(i)] >= [child1(i)] and we have
@ -80,7 +80,7 @@ static SECP256K1_INLINE void heap_down(unsigned char *a, size_t i, size_t heap_s
return; return;
} }
} else if (0 < cmp(a + child1(i)*stride, a + i*stride, cmp_data)) { } else if (0 < cmp(a + child1(i)*stride, a + i*stride, cmp_data)) {
swap(a, i, child1(i), stride); heap_swap(a, i, child1(i), stride);
i = child1(i); i = child1(i);
} else { } else {
return; return;
@ -106,7 +106,7 @@ static void secp256k1_hsort(void *ptr, size_t count, size_t size,
} }
for(i = count; 1 < i; --i) { for(i = count; 1 < i; --i) {
/* Extract the largest value from the heap */ /* Extract the largest value from the heap */
swap(ptr, 0, i-1, size); heap_swap(ptr, 0, i-1, size);
/* Repair the heap condition */ /* Repair the heap condition */
heap_down(ptr, 0, i-1, size, cmp, cmp_data); heap_down(ptr, 0, i-1, size, cmp, cmp_data);