Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove uses of #include <string.h> #842

Merged
merged 2 commits into from
Jun 14, 2019
Merged

Remove uses of #include <string.h> #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70e3979
Remove `#include <string.h>` in P-256 and P-384 code.
briansmith Jun 4, 2019
677edff
Remove `#includes <string.h>` in Curve25519.
briansmith Jun 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions crypto/fipsmodule/ec/ecp_nistz256.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@

#include "ecp_nistz256.h"

#include <string.h>

#include "ecp_nistz.h"
#include "../bn/internal.h"
#include "../../limbs/limbs.inl"
Expand Down
4 changes: 3 additions & 1 deletion crypto/fipsmodule/ec/ecp_nistz384.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@ void GFp_nistz384_point_add(P384_POINT *r, const P384_POINT *a,
if (is_equal(S1, S2)) {
GFp_nistz384_point_double(r, a);
} else {
memset(r, 0, sizeof(*r));
limbs_zero(r->X, P384_LIMBS);
limbs_zero(r->Y, P384_LIMBS);
limbs_zero(r->Z, P384_LIMBS);
}
return;
}
Expand Down
8 changes: 3 additions & 5 deletions crypto/fipsmodule/ec/gfp_p256.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,16 @@ void GFp_p256_scalar_sqr_rep_mont(ScalarMont r, const ScalarMont a, Limb rep) {

#if !defined(OPENSSL_X86_64)

#include <string.h>

/* TODO(perf): Optimize these. */

void GFp_nistz256_select_w5(P256_POINT *out, const P256_POINT table[16],
int index) {
assert(index >= 0);
size_t index_s = (size_t)index; /* XXX: constant time? */

alignas(32) Elem x; memset(x, 0, sizeof(x));
alignas(32) Elem y; memset(y, 0, sizeof(y));
alignas(32) Elem z; memset(z, 0, sizeof(z));
alignas(32) Elem x; limbs_zero(x, P256_LIMBS);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here and below, this can be written as

alignas(32) Elem x = {0};

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I made a TODO about this: issue #844.

alignas(32) Elem y; limbs_zero(y, P256_LIMBS);
alignas(32) Elem z; limbs_zero(z, P256_LIMBS);

for (size_t i = 0; i < 16; ++i) {
Limb mask = constant_time_eq_w(index_s, i + 1);
Expand Down
8 changes: 3 additions & 5 deletions crypto/fipsmodule/ec/gfp_p384.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@

#include "../../limbs/limbs.h"

#include <string.h>

#include "ecp_nistz384.h"
#include "../bn/internal.h"
#include "../../internal.h"
Expand Down Expand Up @@ -223,9 +221,9 @@ void GFp_p384_scalar_mul_mont(ScalarMont r, const ScalarMont a,

static void gfp_p384_point_select_w5(P384_POINT *out,
const P384_POINT table[16], size_t index) {
Elem x; memset(x, 0, sizeof(x));
Elem y; memset(y, 0, sizeof(y));
Elem z; memset(z, 0, sizeof(z));
Elem x; limbs_zero(x, P384_LIMBS);
Elem y; limbs_zero(y, P384_LIMBS);
Elem z; limbs_zero(z, P384_LIMBS);

for (size_t i = 0; i < 16; ++i) {
Limb mask = constant_time_eq_w(index, i + 1);
Expand Down
6 changes: 6 additions & 0 deletions crypto/internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,4 +255,10 @@ static inline void to_be_u64_ptr(uint8_t *out, uint64_t value) {
out[7] = (uint8_t)value;
}

static inline void bytes_copy(uint8_t out[], const uint8_t in[], size_t len) {
for (size_t i = 0; i < len; ++i) {
out[i] = in[i];
}
}

#endif // OPENSSL_HEADER_CRYPTO_INTERNAL_H
6 changes: 6 additions & 0 deletions crypto/limbs/limbs.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,3 +153,9 @@ static inline void limbs_select(Limb r[], const Limb table[],
}
}
}

static inline void limbs_zero(Limb r[], size_t num_limbs) {
for (size_t i = 0; i < num_limbs; ++i) {
r[i] = 0;
}
}
30 changes: 10 additions & 20 deletions third_party/fiat/curve25519.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
#pragma warning(push, 3)
#endif

#include <string.h>

#if defined(_MSC_VER)
#pragma warning(pop)
#endif
Expand Down Expand Up @@ -93,9 +91,6 @@ static uint64_t load_4(const uint8_t *in) {

#if defined(BORINGSSL_CURVE25519_64BIT)

typedef uint64_t fe_limb_t;
#define FE_NUM_LIMBS 5

// assert_fe asserts that |f| satisfies bounds:
//
// [[0x0 ~> 0x8cccccccccccc],
Expand Down Expand Up @@ -132,9 +127,6 @@ typedef uint64_t fe_limb_t;

#else

typedef uint32_t fe_limb_t;
#define FE_NUM_LIMBS 10

// assert_fe asserts that |f| satisfies bounds:
//
// [[0x0 ~> 0x4666666], [0x0 ~> 0x2333333],
Expand Down Expand Up @@ -185,7 +177,7 @@ static void fe_frombytes_strict(fe *h, const uint8_t s[32]) {

static void fe_frombytes(fe *h, const uint8_t s[32]) {
uint8_t s_copy[32];
memcpy(s_copy, s, 32);
bytes_copy(s_copy, s, 32);
s_copy[31] &= 0x7f;
fe_frombytes_strict(h, s_copy);
}
Expand All @@ -197,21 +189,21 @@ static void fe_tobytes(uint8_t s[32], const fe *f) {

// h = 0
static void fe_0(fe *h) {
memset(h, 0, sizeof(fe));
fe_limbs_zero(h->v);
}

static void fe_loose_0(fe_loose *h) {
memset(h, 0, sizeof(fe_loose));
fe_limbs_zero(h->v);
}

// h = 1
static void fe_1(fe *h) {
memset(h, 0, sizeof(fe));
fe_0(h);
h->v[0] = 1;
}

static void fe_loose_1(fe_loose *h) {
memset(h, 0, sizeof(fe_loose));
fe_loose_0(h);
h->v[0] = 1;
}

Expand Down Expand Up @@ -333,17 +325,15 @@ static void fe_cmov(fe_loose *f, const fe_loose *g, fe_limb_t b) {

// h = f
static void fe_copy(fe *h, const fe *f) {
memmove(h, f, sizeof(fe));
fe_limbs_copy(h->v, f->v);
}

static void fe_copy_lt(fe_loose *h, const fe *f) {
OPENSSL_STATIC_ASSERT(sizeof(fe_loose) == sizeof(fe),
"fe and fe_loose mismatch");
memmove(h, f, sizeof(fe));
fe_limbs_copy(h->v, f->v);
}
#if !defined(OPENSSL_SMALL)
static void fe_copy_ll(fe_loose *h, const fe_loose *f) {
memmove(h, f, sizeof(fe_loose));
fe_limbs_copy(h->v, f->v);
}
#endif // !defined(OPENSSL_SMALL)

Expand Down Expand Up @@ -1810,7 +1800,7 @@ void GFp_x25519_scalar_mult_generic(uint8_t out[32],
fe_loose x2l, z2l, x3l, tmp0l, tmp1l;

uint8_t e[32];
memcpy(e, scalar, 32);
bytes_copy(e, scalar, 32);
GFp_x25519_sc_mask(e);
// The following implementation was transcribed to Coq and proven to
// correspond to unary scalar multiplication in affine coordinates given that
Expand Down Expand Up @@ -1885,7 +1875,7 @@ void GFp_x25519_scalar_mult_generic(uint8_t out[32],
void GFp_x25519_public_from_private_generic(uint8_t out_public_value[32],
const uint8_t private_key[32]) {
uint8_t e[32];
memcpy(e, private_key, 32);
bytes_copy(e, private_key, 32);
GFp_x25519_sc_mask(e);

ge_p3 A;
Expand Down
37 changes: 25 additions & 12 deletions third_party/fiat/internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,30 +41,43 @@ void GFp_x25519_NEON(uint8_t out[32], const uint8_t scalar[32],
#endif

#if defined(BORINGSSL_CURVE25519_64BIT)
// fe means field element. Here the field is \Z/(2^255-19). An element t,
// An element t,
// entries t[0]...t[4], represents the integer t[0]+2^51 t[1]+2^102 t[2]+2^153
// t[3]+2^204 t[4].
// fe limbs are bounded by 1.125*2^51.
// Multiplication and carrying produce fe from fe_loose.
typedef struct fe { uint64_t v[5]; } fe;

// fe_loose limbs are bounded by 3.375*2^51.
// Addition and subtraction produce fe_loose from (fe, fe).
typedef struct fe_loose { uint64_t v[5]; } fe_loose;
typedef uint64_t fe_limb_t;
#define FE_NUM_LIMBS 5
#else
// fe means field element. Here the field is \Z/(2^255-19). An element t,
// An element t,
// entries t[0]...t[9], represents the integer t[0]+2^26 t[1]+2^51 t[2]+2^77
// t[3]+2^102 t[4]+...+2^230 t[9].
// fe limbs are bounded by 1.125*2^26,1.125*2^25,1.125*2^26,1.125*2^25,etc.
// fe_loose limbs are bounded by 3.375*2^26,3.375*2^25,3.375*2^26,3.375*2^25,etc.
typedef uint32_t fe_limb_t;
#define FE_NUM_LIMBS 10
#endif

// fe means field element. Here the field is \Z/(2^255-19).
// Multiplication and carrying produce fe from fe_loose.
//
// Keep in sync with `Elem` and `ELEM_LIMBS` in curve25519/ops.rs.
typedef struct fe { uint32_t v[10]; } fe;
typedef struct fe { fe_limb_t v[FE_NUM_LIMBS]; } fe;

// fe_loose limbs are bounded by 3.375*2^26,3.375*2^25,3.375*2^26,3.375*2^25,etc.
// Addition and subtraction produce fe_loose from (fe, fe).
typedef struct fe_loose { uint32_t v[10]; } fe_loose;
#endif
// Keep in sync with `Elem` and `ELEM_LIMBS` in curve25519/ops.rs.
typedef struct fe_loose { fe_limb_t v[FE_NUM_LIMBS]; } fe_loose;

static inline void fe_limbs_copy(fe_limb_t r[], const fe_limb_t a[]) {
for (size_t i = 0; i < FE_NUM_LIMBS; ++i) {
r[i] = a[i];
}
}

static inline void fe_limbs_zero(fe_limb_t r[]) {
for (size_t i = 0; i < FE_NUM_LIMBS; ++i) {
r[i] = 0;
}
}

// ge means group element.
//
Expand Down