#include <stdlib.h>
#include <inttypes.h>
+#include <string.h>
#include "bigint.h"
#include "ecc.h"
#include "random_dummy.h"
#include "ecdsa.h"
#include "hfal-basic.h"
-uint8_t ecdsa_signature_alloc(ecdsa_signature_t* s, size_t length_B){
+#include <stdio.h>
+#include "bigint_io.h"
+
+
+uint8_t ecdsa_signature_alloc(ecdsa_signature_t *s, size_t length_B){
if(!(s->r.wordv = malloc(length_B))){
+ printf_P(PSTR("DBG: XXX <%S %s %d>\n"), PSTR(__FILE__), __func__, __LINE__);
return 1;
}
if(!(s->s.wordv = malloc(length_B))){
+ printf_P(PSTR("DBG: XXX <%S %s %d>\n"), PSTR(__FILE__), __func__, __LINE__);
free(s->r.wordv);
return 1;
}
return 0;
}
-void ecdsa_signature_free(ecdsa_signature_t* s){
+void ecdsa_signature_free(ecdsa_signature_t *s){
free(s->r.wordv);
free(s->s.wordv);
}
-uint8_t ecdsa_sign_bigint(ecdsa_signature_t* s, const bigint_t* m,
- const ecdsa_ctx_t* ctx, const bigint_t* k){
+uint8_t ecdsa_sign_bigint(ecdsa_signature_t *s, const bigint_t *m,
+ const ecdsa_ctx_t *ctx, const bigint_t *k){
bigint_t t;
ecc_combi_point_t q;
if(!(t.wordv = malloc(ctx->curve->p->length_W * 2 * sizeof(bigint_word_t)))){
+ printf_P(PSTR("DBG: XXX <%S %s %d>\n"), PSTR(__FILE__), __func__, __LINE__);
return 1;
}
- if(!ecc_chudnovsky_point_alloc(&q.chudnovsky, ctx->curve->p->length_W * sizeof(bigint_word_t))){
+ t.info = 0;
+ if(ecc_chudnovsky_point_alloc(&q.chudnovsky, ctx->curve->p->length_W * sizeof(bigint_word_t))){
free(t.wordv);
+ printf_P(PSTR("item size: %u bytes\n"), ctx->curve->p->length_W * sizeof(bigint_word_t));
+ printf_P(PSTR("DBG: XXX <%S %s %d>\n"), PSTR(__FILE__), __func__, __LINE__);
return 1;
}
ecc_chudnovsky_multiplication(&q.chudnovsky, k, ctx->basepoint, ctx->curve);
if(q.chudnovsky.x.length_W == 0){
+ printf_P(PSTR("DBG: XXX <%S %s %d>\n"), PSTR(__FILE__), __func__, __LINE__);
return 2;
}
ecc_chudnovsky_to_affine_point(&q.affine, &q.chudnovsky, ctx->curve);
- bigint_inverse(&s->r, k, ctx->curve->p);
+ bigint_inverse(&s->s, k, ctx->curve->n);
+
bigint_mul_u(&t, &q.affine.x, ctx->priv);
- ctx->curve->reduce_p(&t);
+ bigint_reduce(&t, ctx->curve->n);
bigint_add_u(&t, &t, m);
- ctx->curve->reduce_p(&t);
- bigint_mul_u(&t, &t, &s->r);
- ctx->curve->reduce_p(&t);
+ bigint_reduce(&t, ctx->curve->n);
+ bigint_mul_u(&t, &t, &s->s);
+ bigint_reduce(&t, ctx->curve->n);
if(t.length_W == 0){
+ printf_P(PSTR("DBG: XXX <%S %s %d>\n"), PSTR(__FILE__), __func__, __LINE__);
return 2;
}
bigint_copy(&s->r, &q.affine.x);
return 0;
}
-uint8_t ecdsa_sign_message(ecdsa_signature_t* s, const void* m, uint16_t m_len_b,
- const hfdesc_t* hash_desc, const ecdsa_ctx_t* ctx,
+
+uint8_t ecdsa_sign_hash(ecdsa_signature_t *s, const void *hash,
+ size_t hash_len_B, const ecdsa_ctx_t *ctx,
const void *rand_in){
bigint_t m_int;
bigint_t r_int;
+ size_t idx = 0;
uint8_t r;
+ r_int.length_W = ctx->curve->p->length_W;
+
if(rand_in == NULL){
if(!(r_int.wordv = malloc(ctx->curve->p->length_W * sizeof(bigint_word_t)))){
return 1;
}
+ }else{
+ r_int.wordv = (bigint_word_t*)rand_in;
+ r_int.info = 0;
+ bigint_adjust(&r_int);
}
- if(!(m_int.wordv = malloc(hfal_hash_getHashsize(hash_desc) / 8))){
- if(rand_in == NULL){
- free(r_int.wordv);
- }
+ m_int.length_W = ctx->curve->p->length_W;
+ m_int.wordv = malloc(m_int.length_W * sizeof(bigint_word_t));
+ if(m_int.wordv == NULL){
+ free(r_int.wordv);
return 1;
}
- hfal_hash_mem(hash_desc, m_int.wordv, m, m_len_b);
+ m_int.wordv[m_int.length_W - 1] = 0;
+ if(hash_len_B > m_int.length_W * sizeof(bigint_word_t)){
+ while(idx < m_int.length_W * sizeof(bigint_word_t)){
+ ((uint8_t*)m_int.wordv)[idx] = ((uint8_t*)hash)[m_int.length_W * sizeof(bigint_word_t) - idx - 1];
+ ++idx;
+ }
+ }else{
+ memset(m_int.wordv, 0, m_int.length_W * sizeof(bigint_word_t));
+ // idx += m_int.length_W * sizeof(bigint_word_t) - hash_len_B;
+ while(hash_len_B){
+ ((uint8_t*)m_int.wordv)[idx++] = ((uint8_t*)hash)[--hash_len_B];
+ }
+ }
+ bigint_adjust(&m_int);
do{
if(rand_in == NULL){
size_t i;
do{
i = ctx->curve->p->length_W * sizeof(bigint_word_t) - 1;
- r_int.length_W = ctx->curve->p->length_W;
do{
((uint8_t*)r_int.wordv)[i] = prng_get_byte();
}while(i--);
}
}while((r = ecdsa_sign_bigint(s, &m_int, ctx, &r_int)) == 2 && (rand_in == NULL));
+ free(m_int.wordv);
+
+ return r;
+}
+
+uint8_t ecdsa_sign_message(ecdsa_signature_t *s, const void *m, uint16_t m_len_b,
+ const hfdesc_t *hash_desc, const ecdsa_ctx_t *ctx,
+ const void *rand_in){
+
+ uint8_t *hash;
+ uint16_t hash_len = hfal_hash_getHashsize(hash_desc) / 8;
+ uint8_t r;
+
+
+ hash = malloc(hash_len);
+ if(hash == NULL){
+ return 1;
+ }
+ hfal_hash_mem(hash_desc, hash, m, m_len_b);
+ ecdsa_sign_hash(s, hash, hash_len, ctx, rand_in);
+
return r;
}