turn some buffers into TLS

[xonotic/d0_blind_id.git] / d0_blind_id.c

diff --git a/d0_blind_id.c b/d0_blind_id.c
index a02aaa7c7cde0a8bce248f7ffaac7ed323f7d950..1920cdc1af9ff4c3e50d8df3cdcb074fc7034db9 100644 (file)
--- a/d0_blind_id.c
+++ b/d0_blind_id.c
@@ -47,7 +47,7 @@
 #define SHA_DIGESTSIZE 32
 const char *sha(const unsigned char *in, size_t len)
 {
-       static char h[32];
+       char h[32];
        d0_blind_id_util_sha256(h, (const char *) in, len);
        return h;
 }
@@ -109,7 +109,8 @@ struct d0_blind_id_s
 #define USING(x) if(!(ctx->x)) return 0
 #define REPLACING(x)
 
-static d0_bignum_t *zero, *one, *four, *temp0, *temp1, *temp2, *temp3, *temp4;
+static d0_bignum_t *zero, *one, *four;
+static d0_bignum_t *temp0, *temp1, *temp2, *temp3, *temp4; // FIXME make these thread safe by putting them in some per-thread object
 
 D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_INITIALIZE(void)
 {
@@ -316,7 +317,7 @@ D0_WARN_UNUSED_RESULT D0_BOOL d0_longhash_destructive(unsigned char *convbuf, si
 
 D0_WARN_UNUSED_RESULT D0_BOOL d0_longhash_bignum(const d0_bignum_t *in, unsigned char *outbuf, size_t outbuflen)
 {
-       static unsigned char convbuf[1024];
+       static __thread unsigned char convbuf[1024];
        size_t sz;
 
        CHECK(d0_bignum_export_unsigned(in, convbuf, sizeof(convbuf)) >= 0);
@@ -463,7 +464,7 @@ fail:
 D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_fingerprint64_public_key(const d0_blind_id_t *ctx, char *outbuf, size_t *outbuflen)
 {
        d0_iobuf_t *out = NULL;
-       static unsigned char convbuf[2048];
+       static __thread unsigned char convbuf[2048];
        d0_iobuf_t *conv = NULL;
        size_t sz, n;
 
@@ -553,7 +554,7 @@ fail:
 D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_generate_private_id_request(d0_blind_id_t *ctx, char *outbuf, size_t *outbuflen)
 {
        d0_iobuf_t *out = NULL;
-       static unsigned char shabuf[2048];
+       static __thread unsigned char shabuf[2048];
        size_t sz;
 
        // temps: temp0 rsa_blind_signature_camouflage^challenge, temp1 (4^s)*rsa_blind_signature_camouflage^challenge
@@ -742,7 +743,7 @@ D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_authenticate_with_private_id_start(d0_
 //   1. get random r, send HASH(4^r)
 {
        d0_iobuf_t *out = NULL;
-       static unsigned char convbuf[1024];
+       static __thread unsigned char convbuf[1024];
        d0_iobuf_t *conv = NULL;
        size_t sz = 0;
        D0_BOOL failed = 0;
@@ -815,7 +816,7 @@ D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_authenticate_with_private_id_challenge
 {
        d0_iobuf_t *in = NULL;
        d0_iobuf_t *out = NULL;
-       static unsigned char shabuf[2048];
+       static __thread unsigned char shabuf[2048];
        size_t sz;
 
        // temps: temp0 order, temp0 signature check
@@ -960,7 +961,7 @@ D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_authenticate_with_private_id_verify(d0
 //      (check using H(g^r) which we know)
 {
        d0_iobuf_t *in = NULL;
-       static unsigned char convbuf[1024];
+       static __thread unsigned char convbuf[1024];
        d0_iobuf_t *conv = NULL;
        size_t sz;
 
@@ -1027,7 +1028,7 @@ fail:
 D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_authenticate_with_private_id_generate_missing_signature(d0_blind_id_t *ctx)
 {
        size_t sz;
-       static unsigned char shabuf[2048];
+       static __thread unsigned char shabuf[2048];
 
        REPLACING(schnorr_H_g_to_s_signature);
        USING(schnorr_g_to_s); USING(rsa_d); USING(rsa_n);
@@ -1052,8 +1053,8 @@ fail:
 D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_sign_with_private_id_sign_internal(d0_blind_id_t *ctx, D0_BOOL is_first, D0_BOOL send_modulus, D0_BOOL with_msg, const char *message, size_t msglen, char *outbuf, size_t *outbuflen)
 {
        d0_iobuf_t *out = NULL;
-       static unsigned char convbuf[1024];
-       static unsigned char shabuf[1024];
+       unsigned char *convbuf = NULL;
+       static __thread unsigned char shabuf[2048];
        d0_iobuf_t *conv = NULL;
        size_t sz = 0;
 
@@ -1083,12 +1084,14 @@ D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_sign_with_private_id_sign_internal(d0_
        CHECK(d0_bignum_mod_pow(temp1, four, ctx->r, ctx->schnorr_G));
 
        // hash it, hash it, everybody hash it
-       conv = d0_iobuf_open_write(convbuf, sizeof(convbuf));
+       conv = d0_iobuf_open_write_p((void **) &convbuf, 0);
        CHECK(d0_iobuf_write_packet(conv, message, msglen));
        CHECK(d0_iobuf_write_bignum(conv, temp1));
        d0_iobuf_close(conv, &sz);
        conv = NULL;
        CHECK(d0_longhash_destructive(convbuf, sz, shabuf, (d0_bignum_size(temp0) + 7) / 8));
+       d0_free(convbuf);
+       convbuf = NULL;
        CHECK(d0_bignum_import_unsigned(temp2, shabuf, (d0_bignum_size(temp0) + 7) / 8));
        CHECK(d0_iobuf_write_bignum(out, temp2));
 
@@ -1124,8 +1127,8 @@ D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_sign_with_private_id_verify_internal(d
 {
        d0_iobuf_t *in = NULL;
        d0_iobuf_t *conv = NULL;
-       static unsigned char convbuf[2048];
-       static unsigned char shabuf[2048];
+       unsigned char *convbuf = NULL;
+       static __thread unsigned char shabuf[2048];
        size_t sz;
 
        if(is_first)
@@ -1202,12 +1205,14 @@ D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_sign_with_private_id_verify_internal(d
        CHECK_ASSIGN(temp3, d0_bignum_mod_mul(temp3, temp1, temp2, ctx->schnorr_G)); // temp3 now is g^r
 
        // hash it, hash it, everybody hash it
-       conv = d0_iobuf_open_write(convbuf, sizeof(convbuf));
+       conv = d0_iobuf_open_write_p((void **) &convbuf, 0);
        CHECK(d0_iobuf_write_packet(conv, msg, *msglen));
        CHECK(d0_iobuf_write_bignum(conv, temp3));
        d0_iobuf_close(conv, &sz);
        conv = NULL;
        CHECK(d0_longhash_destructive(convbuf, sz, shabuf, (d0_bignum_size(temp4) + 7) / 8));
+       d0_free(convbuf);
+       convbuf = NULL;
        CHECK(d0_bignum_import_unsigned(temp1, shabuf, (d0_bignum_size(temp4) + 7) / 8));
 
        // verify signature
@@ -1235,7 +1240,7 @@ D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_sign_with_private_id_verify_detached(d
 D0_WARN_UNUSED_RESULT D0_BOOL d0_blind_id_fingerprint64_public_id(const d0_blind_id_t *ctx, char *outbuf, size_t *outbuflen)
 {
        d0_iobuf_t *out = NULL;
-       static unsigned char convbuf[1024];
+       static __thread unsigned char convbuf[1024];
        d0_iobuf_t *conv = NULL;
        size_t sz, n;