wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove some more unneeded code

Browse source 
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5105)
This commit is contained in:
Matt Caswell 2017-11-16 16:20:34 +00:00
parent a469abf05e
commit 46b4183155
2 changed files with 1 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
crypto/ec/curve448/constant_time.h
View file

@ -181,120 +181,6 @@ constant_time_lookup (
}
}
/**
* @brief Constant-time equivalent of memcpy(table + elem_bytes*idx, in, elem_bytes);
*
* The table must be at least as aligned as elem_bytes. The input must be word aligned,
* and if the output size is vector aligned it must also be vector aligned.
*
* The table and input must not alias.
*/
static __inline__ void
__attribute__((unused,always_inline))
constant_time_insert (
void *__restrict__ table_,
const void *in_,
word_t elem_bytes,
word_t n_table,
word_t idx
) {
big_register_t big_one = br_set_to_mask(1), big_i = br_set_to_mask(idx);
/* Can't do pointer arithmetic on void* */
const unsigned char *in = (const unsigned char *)in_;
unsigned char *table = (unsigned char *)table_;
word_t j,k;
for (j=0; j<n_table; j++, big_i-=big_one) {
big_register_t br_mask = br_is_zero(big_i);
for (k=0; k<=elem_bytes-sizeof(big_register_t); k+=sizeof(big_register_t)) {
if (elem_bytes % sizeof(big_register_t)) {
/* unaligned */
((unaligned_br_t*)(&table[k+j*elem_bytes]))->unaligned
= ( ((unaligned_br_t*)(&table[k+j*elem_bytes]))->unaligned & ~br_mask )
| ( ((const unaligned_br_t *)(in+k))->unaligned & br_mask );
} else {
/* aligned */
*(big_register_t*)(&table[k+j*elem_bytes])
= ( *(big_register_t*)(&table[k+j*elem_bytes]) & ~br_mask )
| ( *(const big_register_t *)(in+k) & br_mask );
}
}
word_t mask = word_is_zero(idx^j);
if (elem_bytes % sizeof(big_register_t) >= sizeof(word_t)) {
for (; k<=elem_bytes-sizeof(word_t); k+=sizeof(word_t)) {
if (elem_bytes % sizeof(word_t)) {
/* output unaligned, input aligned */
((unaligned_word_t*)(&table[k+j*elem_bytes]))->unaligned
= ( ((unaligned_word_t*)(&table[k+j*elem_bytes]))->unaligned & ~mask )
| ( *(const word_t *)(in+k) & mask );
} else {
/* aligned */
*(word_t*)(&table[k+j*elem_bytes])
= ( *(word_t*)(&table[k+j*elem_bytes]) & ~mask )
| ( *(const word_t *)(in+k) & mask );
}
}
}
if (elem_bytes % sizeof(word_t)) {
for (; k<elem_bytes; k+=1) {
table[k+j*elem_bytes]
= ( table[k+j*elem_bytes] & ~mask )
| ( in[k] & mask );
}
}
}
}
/**
* @brief Constant-time a = b&mask.
*
* The input and output must be at least as aligned as elem_bytes.
*/
static __inline__ void
__attribute__((unused,always_inline))
constant_time_mask (
void * a_,
const void *b_,
word_t elem_bytes,
mask_t mask
) {
unsigned char *a = (unsigned char *)a_;
const unsigned char *b = (const unsigned char *)b_;
word_t k;
big_register_t br_mask = br_set_to_mask(mask);
for (k=0; k<=elem_bytes-sizeof(big_register_t); k+=sizeof(big_register_t)) {
if (elem_bytes % sizeof(big_register_t)) {
/* unaligned */
((unaligned_br_t*)(&a[k]))->unaligned = br_mask & ((const unaligned_br_t*)(&b[k]))->unaligned;
} else {
/* aligned */
*(big_register_t *)(a+k) = br_mask & *(const big_register_t*)(&b[k]);
}
}
if (elem_bytes % sizeof(big_register_t) >= sizeof(word_t)) {
for (; k<=elem_bytes-sizeof(word_t); k+=sizeof(word_t)) {
if (elem_bytes % sizeof(word_t)) {
/* unaligned */
((unaligned_word_t*)(&a[k]))->unaligned = mask & ((const unaligned_word_t*)(&b[k]))->unaligned;
} else {
/* aligned */
*(word_t *)(a+k) = mask & *(const word_t*)(&b[k]);
}
}
}
if (elem_bytes % sizeof(word_t)) {
for (; k<elem_bytes; k+=1) {
a[k] = mask & b[k];
}
}
}
/**
* @brief Constant-time a = mask ? bTrue : bFalse.
*

11
crypto/ec/curve448/point_448.h
View file

@ -16,6 +16,7 @@
#define __DECAF_POINT_448_H__ 1
#include "curve448utils.h"
#include "field.h"
#ifdef __cplusplus
extern "C" {
@ -28,16 +29,6 @@ extern "C" {
/** The number of bits in a scalar */
#define DECAF_448_SCALAR_BITS 446
/** @cond internal */
#ifndef __DECAF_448_GF_DEFINED__
#define __DECAF_448_GF_DEFINED__ 1
/** @brief Galois field element internal structure */
typedef struct gf_448_s {
decaf_word_t limb[512/DECAF_WORD_BITS];
} __attribute__((aligned(32))) gf_448_s, gf_448_t[1];
#endif /* __DECAF_448_GF_DEFINED__ */
/** @endcond */
/** Number of bytes in a serialized point. */
#define DECAF_448_SER_BYTES 56