1999

Committed 12 Apr 2021 10:13AM UTC coverage: 93.255%. First build

Build # 1999

Build Type

Pull #450

travis-ci

Committed by

web-flow

Commit Message

<a href="https://github.com/libtom/libtomcrypt/commit/<a class=hub.com/libtom/libtomcrypt/commit/<a class="double-link" href="https://git"><a class=hub.com/libtom/libtomcrypt/commit/<a class="double-link" href="https://git"><a class=hub.com/libtom/libtomcrypt/commit/<a class="double-link" href="https://git"><a class=hub.com/libtom/libtomcrypt/commit/<a class="double-link" href="https://git"><a class=hub.com/libtom/libtomcrypt/commit/ef95a59359d38fb42af4cb0ba69e9f00148c2e29">ef95a5935">&lt;a href=&quot;https://github.com/libtom/libtomcrypt/commit/</a><a class="double-link" href="https://github.com/libtom/libtomcrypt/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/libtom/libtomcrypt/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/libtom/libtomcrypt/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/libtom/libtomcrypt/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/libtom/libtomcrypt/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/libtom/libtomcrypt/commit/ef95a59359d38fb42af4cb0ba69e9f00148c2e29">ef95a5935</a><a href="https://github.com/libtom/libtomcrypt/commit/ef95a59359d38fb42af4cb0ba69e9f00148c2e29">&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/libtom/libtomcrypt/commit/&lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/libtom/libtomcrypt/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/libtom/libtomcrypt/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/libtom/libtomcrypt/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/libtom/libtomcrypt/commit/ef95a59359d38fb42af4cb0ba69e9f00148c2e29&quot;&gt;ef95a5935&lt;/a&gt;&lt;a href=&quot;https://github.com/libtom/libtomcrypt/commit/ef95a59359d38fb42af4cb0ba69e9f00148c2e29&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/libtom/libtomcrypt/commit/ef95a59359d38fb42af4cb0ba69e9f00148c2e29&amp;quot;&amp;gt;&amp;amp;quot;&amp;amp;gt;&amp;amp;amp;lt;a href=&amp;amp;amp;quot;https://github.com/libtom/libtomcrypt/commit/&amp;amp;lt;/... (continued)

Pull Request Pull Request #450: An attempt to fix #449 (ECDSA forcing DER/ASN.1)

Run Details

208 of 208 new or added lines in 10 files covered. (100.0%)

15028 of 16115 relevant lines covered (93.25%)

409991.51 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

91.84

/src/pk/ecc/ecc_sign_hash_internal.c

/* LibTomCrypt, modular cryptographic library -- Tom St Denis */
/* SPDX-License-Identifier: Unlicense */

#include "tomcrypt_private.h"

#ifdef LTC_MECC

int ecc_sign_hash_internal(const unsigned char *in,  unsigned long inlen,
                           void *r, void *s, prng_state *prng, int wprng,
                           int *recid, const ecc_key *key)
{
   ecc_key       pubkey;
   void          *e, *p, *b;
   int           v = 0;
   int           err, max_iterations = LTC_PK_MAX_RETRIES;
   unsigned long pbits, pbytes, i, shift_right;
   unsigned char ch, buf[MAXBLOCKSIZE];

   LTC_ARGCHK(r      != NULL);
   LTC_ARGCHK(s      != NULL);
   LTC_ARGCHK(in     != NULL);
   LTC_ARGCHK(key    != NULL);

   /* is this a private key? */
   if (key->type != PK_PRIVATE) {
      return CRYPT_PK_NOT_PRIVATE;
   }

   /* init the bignums */
   if ((err = mp_init_multi(&e, &b, NULL)) != CRYPT_OK) {
      return err;
   }

   /* get the hash and load it as a bignum into 'e' */
   p = key->dp.order;
   pbits = mp_count_bits(p);
   pbytes = (pbits+7) >> 3;
   if (pbits > inlen*8) {
      if ((err = mp_read_unsigned_bin(e, (unsigned char *)in, inlen)) != CRYPT_OK)    { goto errnokey; }
   }
   else if (pbits % 8 == 0) {
      if ((err = mp_read_unsigned_bin(e, (unsigned char *)in, pbytes)) != CRYPT_OK)   { goto errnokey; }
   }
   else {
      if (pbytes >= MAXBLOCKSIZE) {
         err = CRYPT_BUFFER_OVERFLOW;
         goto error;
      }
      shift_right = 8 - pbits % 8;
      for (i=0, ch=0; i<pbytes; i++) {
        buf[i] = ch;
        ch = (in[i] << (8-shift_right));
        buf[i] = buf[i] ^ (in[i] >> shift_right);
      }
      if ((err = mp_read_unsigned_bin(e, (unsigned char *)buf, pbytes)) != CRYPT_OK)  { goto errnokey; }
   }

   /* make up a key and export the public copy */
   do {
      if ((err = ecc_copy_curve(key, &pubkey)) != CRYPT_OK)                { goto errnokey; }
      if ((err = ecc_generate_key(prng, wprng, &pubkey)) != CRYPT_OK)      { goto errnokey; }

      /* find r = x1 mod n */
      if ((err = mp_mod(pubkey.pubkey.x, p, r)) != CRYPT_OK)               { goto error; }

      if (recid) {
         /* find recovery ID (if needed) */
         v = 0;
         if (mp_copy(pubkey.pubkey.x, s) != CRYPT_OK)                      { goto error; }
         while (mp_cmp_d(s, 0) == LTC_MP_GT && mp_cmp(s, p) != LTC_MP_LT) {
            /* Compute x1 div n... this will almost never be reached for curves with order 1 */
            v += 2;
            if ((err = mp_sub(s, p, s)) != CRYPT_OK)                       { goto error; }
         }
         if (mp_isodd(pubkey.pubkey.y)) v += 1;
      }

      if (mp_iszero(r) == LTC_MP_YES) {
         ecc_free(&pubkey);
      } else {
         if ((err = rand_bn_upto(b, p, prng, wprng)) != CRYPT_OK)          { goto error; } /* b = blinding value */
         /* find s = (e + xr)/k */
         if ((err = mp_mulmod(pubkey.k, b, p, pubkey.k)) != CRYPT_OK)      { goto error; } /* k = kb */
         if ((err = mp_invmod(pubkey.k, p, pubkey.k)) != CRYPT_OK)         { goto error; } /* k = 1/kb */
         if ((err = mp_mulmod(key->k, r, p, s)) != CRYPT_OK)               { goto error; } /* s = xr */
         if ((err = mp_mulmod(pubkey.k, s, p, s)) != CRYPT_OK)             { goto error; } /* s = xr/kb */
         if ((err = mp_mulmod(pubkey.k, e, p, e)) != CRYPT_OK)             { goto error; } /* e = e/kb */
         if ((err = mp_add(e, s, s)) != CRYPT_OK)                          { goto error; } /* s = e/kb + xr/kb */
         if ((err = mp_mulmod(s, b, p, s)) != CRYPT_OK)                    { goto error; } /* s = b(e/kb + xr/kb) = (e + xr)/k */
         ecc_free(&pubkey);
         if (mp_iszero(s) == LTC_MP_NO) {
            break;
         }
      }
   } while (--max_iterations > 0);

   if (max_iterations == 0) {
      goto errnokey;
   }

   if (recid) *recid = v;

   goto errnokey;
error:
   ecc_free(&pubkey);
errnokey:
   mp_clear_multi(e, b, NULL);
   return err;
}

#endif

1	/* LibTomCrypt, modular cryptographic library -- Tom St Denis */
2	/* SPDX-License-Identifier: Unlicense */
3
4	#include "tomcrypt_private.h"
5
6	#ifdef LTC_MECC
7
8	int ecc_sign_hash_internal(const unsigned char *in, unsigned long inlen,	420✔
9	void r, void s, prng_state *prng, int wprng,
10	int recid, const ecc_key key)
11	{
12	ecc_key pubkey;
13	void e, p, *b;
14	int v = 0;
15	int err, max_iterations = LTC_PK_MAX_RETRIES;
16	unsigned long pbits, pbytes, i, shift_right;
17	unsigned char ch, buf[MAXBLOCKSIZE];
18
19	LTC_ARGCHK(r != NULL);	420✔
20	LTC_ARGCHK(s != NULL);	420✔
21	LTC_ARGCHK(in != NULL);	420✔
22	LTC_ARGCHK(key != NULL);	420✔
23
24	/* is this a private key? */
25	if (key->type != PK_PRIVATE) {	420✔
26	return CRYPT_PK_NOT_PRIVATE;
27	}
28
29	/* init the bignums */
30	if ((err = mp_init_multi(&e, &b, NULL)) != CRYPT_OK) {	420✔
31	return err;
32	}
33
34	/* get the hash and load it as a bignum into 'e' */
35	p = key->dp.order;	420✔
36	pbits = mp_count_bits(p);	420✔
37	pbytes = (pbits+7) >> 3;	420✔
38	if (pbits > inlen*8) {	420✔
39	if ((err = mp_read_unsigned_bin(e, (unsigned char *)in, inlen)) != CRYPT_OK) { goto errnokey; }	348✔
40	}
41	else if (pbits % 8 == 0) {	72✔
42	if ((err = mp_read_unsigned_bin(e, (unsigned char *)in, pbytes)) != CRYPT_OK) { goto errnokey; }	56✔
43	}
44	else {
45	if (pbytes >= MAXBLOCKSIZE) {	16✔
46	err = CRYPT_BUFFER_OVERFLOW;
47	goto error;
48	}
49	shift_right = 8 - pbits % 8;	16✔
50	for (i=0, ch=0; i<pbytes; i++) {	256✔
51	buf[i] = ch;
52	ch = (in[i] << (8-shift_right));	240✔
53	buf[i] = buf[i] ^ (in[i] >> shift_right);	240✔
54	}
55	if ((err = mp_read_unsigned_bin(e, (unsigned char *)buf, pbytes)) != CRYPT_OK) { goto errnokey; }	16✔
56	}
57
58	/* make up a key and export the public copy */
59	do {
60	if ((err = ecc_copy_curve(key, &pubkey)) != CRYPT_OK) { goto errnokey; }	420✔
61	if ((err = ecc_generate_key(prng, wprng, &pubkey)) != CRYPT_OK) { goto errnokey; }	420✔
62
63	/* find r = x1 mod n */
64	if ((err = mp_mod(pubkey.pubkey.x, p, r)) != CRYPT_OK) { goto error; }	420✔
65
66	if (recid) {	420✔
67	/* find recovery ID (if needed) */
68	v = 0;
69	if (mp_copy(pubkey.pubkey.x, s) != CRYPT_OK) { goto error; }	98✔
70	while (mp_cmp_d(s, 0) == LTC_MP_GT && mp_cmp(s, p) != LTC_MP_LT) {	103✔
71	/* Compute x1 div n... this will almost never be reached for curves with order 1 */
72	v += 2;	5✔
73	if ((err = mp_sub(s, p, s)) != CRYPT_OK) { goto error; }	5✔
74	}
75	if (mp_isodd(pubkey.pubkey.y)) v += 1;	98✔
76	}
77
78	if (mp_iszero(r) == LTC_MP_YES) {	420✔
79	ecc_free(&pubkey);	×
80	} else {
81	if ((err = rand_bn_upto(b, p, prng, wprng)) != CRYPT_OK) { goto error; } /* b = blinding value */	420✔
82	/* find s = (e + xr)/k */
83	if ((err = mp_mulmod(pubkey.k, b, p, pubkey.k)) != CRYPT_OK) { goto error; } /* k = kb */	420✔
84	if ((err = mp_invmod(pubkey.k, p, pubkey.k)) != CRYPT_OK) { goto error; } /* k = 1/kb */	420✔
85	if ((err = mp_mulmod(key->k, r, p, s)) != CRYPT_OK) { goto error; } /* s = xr */	420✔
86	if ((err = mp_mulmod(pubkey.k, s, p, s)) != CRYPT_OK) { goto error; } /* s = xr/kb */	420✔
87	if ((err = mp_mulmod(pubkey.k, e, p, e)) != CRYPT_OK) { goto error; } /* e = e/kb */	420✔
88	if ((err = mp_add(e, s, s)) != CRYPT_OK) { goto error; } /* s = e/kb + xr/kb */	420✔
89	if ((err = mp_mulmod(s, b, p, s)) != CRYPT_OK) { goto error; } /* s = b(e/kb + xr/kb) = (e + xr)/k */	420✔
90	ecc_free(&pubkey);	420✔
91	if (mp_iszero(s) == LTC_MP_NO) {	420✔
92	break;
93	}
94	}
95	} while (--max_iterations > 0);	×
96
97	if (max_iterations == 0) {	420✔
98	goto errnokey;
99	}
100
101	if (recid) *recid = v;	420✔
102
103	goto errnokey;
104	error:	×
105	ecc_free(&pubkey);	×
106	errnokey:	420✔
107	mp_clear_multi(e, b, NULL);	420✔
108	return err;	420✔
109	}
110
111	#endif

libtom / libtomcrypt / 1999

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous