1266

pending completion

Build # 1266

Build Type

push

travis-ci

Committed by

sjaeckel

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/5501572b359460e909551b0b18ef6b3a0d36f9b2">5501572b3<a href="https://github.com/libtom/libtomcrypt/commit/5501572b359460e909551b0b18ef6b3a0d36f9b2">&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/5501572b359460e909551b0b18ef6b3a0d36f9b2&quot;&gt;5501572b3&lt;/a&gt;&lt;a href=&quot;https://github.com/libtom/libtomcrypt/commit/5501572b359460e909551b0b18ef6b3a0d36f9b2&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/libtom/libtomcrypt/commit/5501572b359460e909551b0b18ef6b3a0d36f9b2&amp;quot;&amp;gt;&amp;amp;quot;&amp;amp;gt;Merge pull request #339 from libtom/minor_improvements

Minor improvements
(cherry picked from commit &amp;amp;lt;/a&amp;gt;&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://github.com/libtom/libtomcrypt/commit/&lt;/a&gt;&lt;a class=&quot;double-link&quot; h</a>ref="https://github.com/libtom/libtomcrypt/commit/<a class="double-link" href="https://github.com/libtom/libtomcrypt/commit/df8ed5c76b66f5891c8eeb274769a3f8f7dad086">df8ed5c76</a>">df8ed5c76</a>">df8ed5c76</a><a href="https://github.com/libtom/libtomcrypt/commit/5501572b359460e909551b0b18ef6b3a0d36f9b2">)

Run Details

14 of 14 new or added lines in 3 files covered. (100.0%)

11541 of 12700 relevant lines covered (90.87%)

175813.27 hits per line

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

48.78

/src/pk/asn1/der/utf8/der_encode_utf8_string.c

/* LibTomCrypt, modular cryptographic library -- Tom St Denis
 *
 * LibTomCrypt is a library that provides various cryptographic
 * algorithms in a highly modular and flexible manner.
 *
 * The library is free for all purposes without any express
 * guarantee it works.
 */
#include "tomcrypt.h"

/**
  @file der_encode_utf8_string.c
  ASN.1 DER, encode a UTF8 STRING, Tom St Denis
*/


#ifdef LTC_DER

/**
  Store an UTF8 STRING
  @param in       The array of UTF8 to store (one per wchar_t)
  @param inlen    The number of UTF8 to store
  @param out      [out] The destination for the DER encoded UTF8 STRING
  @param outlen   [in/out] The max size and resulting size of the DER UTF8 STRING
  @return CRYPT_OK if successful
*/
int der_encode_utf8_string(const wchar_t *in,  unsigned long inlen,
                           unsigned char *out, unsigned long *outlen)
{
   unsigned long x, y, len;

   LTC_ARGCHK(in     != NULL);
   LTC_ARGCHK(out    != NULL);
   LTC_ARGCHK(outlen != NULL);

   /* get the size */
   for (x = len = 0; x < inlen; x++) {
       if (!der_utf8_valid_char(in[x])) return CRYPT_INVALID_ARG;
       len += der_utf8_charsize(in[x]);
   }

   if (len < 128) {
      y = 2 + len;
   } else if (len < 256) {
      y = 3 + len;
   } else if (len < 65536UL) {
      y = 4 + len;
   } else if (len < 16777216UL) {
      y = 5 + len;
   } else {
      return CRYPT_INVALID_ARG;
   }

   /* too big? */
   if (y > *outlen) {
      *outlen = y;
      return CRYPT_BUFFER_OVERFLOW;
   }

   /* encode the header+len */
   x = 0;
   out[x++] = 0x0C;
   if (len < 128) {
      out[x++] = (unsigned char)len;
   } else if (len < 256) {
      out[x++] = 0x81;
      out[x++] = (unsigned char)len;
   } else if (len < 65536UL) {
      out[x++] = 0x82;
      out[x++] = (unsigned char)((len>>8)&255);
      out[x++] = (unsigned char)(len&255);
   } else if (len < 16777216UL) {
      out[x++] = 0x83;
      out[x++] = (unsigned char)((len>>16)&255);
      out[x++] = (unsigned char)((len>>8)&255);
      out[x++] = (unsigned char)(len&255);
   } else {
       /* coverity[dead_error_line] */
      return CRYPT_INVALID_ARG;
   }

   /* store UTF8 */
   for (y = 0; y < inlen; y++) {
       switch (der_utf8_charsize(in[y])) {
          case 1: out[x++] = (unsigned char)in[y]; break;
          case 2: out[x++] = 0xC0 | ((in[y] >> 6) & 0x1F);  out[x++] = 0x80 | (in[y] & 0x3F); break;
          case 3: out[x++] = 0xE0 | ((in[y] >> 12) & 0x0F); out[x++] = 0x80 | ((in[y] >> 6) & 0x3F); out[x++] = 0x80 | (in[y] & 0x3F); break;
#if !defined(LTC_WCHAR_MAX) || LTC_WCHAR_MAX > 0xFFFF
          case 4: out[x++] = 0xF0 | ((in[y] >> 18) & 0x07); out[x++] = 0x80 | ((in[y] >> 12) & 0x3F); out[x++] = 0x80 | ((in[y] >> 6) & 0x3F); out[x++] = 0x80 | (in[y] & 0x3F); break;
#endif
       }
   }

   /* retun length */
   *outlen = x;

   return CRYPT_OK;
}

#endif

/* ref:         $Format:%D$ */
/* git commit:  $Format:%H$ */
/* commit time: $Format:%ai$ */

1	/* LibTomCrypt, modular cryptographic library -- Tom St Denis
2	*
3	* LibTomCrypt is a library that provides various cryptographic
4	* algorithms in a highly modular and flexible manner.
5	*
6	* The library is free for all purposes without any express
7	* guarantee it works.
8	*/
9	#include "tomcrypt.h"
10
11	/**
12	@file der_encode_utf8_string.c
13	ASN.1 DER, encode a UTF8 STRING, Tom St Denis
14	*/
15
16
17	#ifdef LTC_DER
18
19	/**
20	Store an UTF8 STRING
21	@param in The array of UTF8 to store (one per wchar_t)
22	@param inlen The number of UTF8 to store
23	@param out [out] The destination for the DER encoded UTF8 STRING
24	@param outlen [in/out] The max size and resulting size of the DER UTF8 STRING
25	@return CRYPT_OK if successful
26	*/
27	int der_encode_utf8_string(const wchar_t *in, unsigned long inlen,	2✔
28	unsigned char out, unsigned long outlen)
29	{
30	unsigned long x, y, len;
31
32	LTC_ARGCHK(in != NULL);	2✔
33	LTC_ARGCHK(out != NULL);	2✔
34	LTC_ARGCHK(outlen != NULL);	2✔
35
36	/* get the size */
37	for (x = len = 0; x < inlen; x++) {	7✔
38	if (!der_utf8_valid_char(in[x])) return CRYPT_INVALID_ARG;	7✔
39	len += der_utf8_charsize(in[x]);	7✔
40	}
41
42	if (len < 128) {	2✔
43	y = 2 + len;	2✔
44	} else if (len < 256) {	×
45	y = 3 + len;	×
46	} else if (len < 65536UL) {	×
47	y = 4 + len;	×
48	} else if (len < 16777216UL) {	×
49	y = 5 + len;	×
50	} else {
51	return CRYPT_INVALID_ARG;
52	}
53
54	/* too big? */
55	if (y > *outlen) {	2✔
56	*outlen = y;	×
57	return CRYPT_BUFFER_OVERFLOW;	×
58	}
59
60	/* encode the header+len */
61	x = 0;
62	out[x++] = 0x0C;	2✔
63	if (len < 128) {	2✔
64	out[x++] = (unsigned char)len;	2✔
65	} else if (len < 256) {	×
66	out[x++] = 0x81;	×
67	out[x++] = (unsigned char)len;	×
68	} else if (len < 65536UL) {	×
69	out[x++] = 0x82;	×
70	out[x++] = (unsigned char)((len>>8)&255);	×
71	out[x++] = (unsigned char)(len&255);	×
72	} else if (len < 16777216UL) {	×
73	out[x++] = 0x83;	×
74	out[x++] = (unsigned char)((len>>16)&255);	×
75	out[x++] = (unsigned char)((len>>8)&255);	×
76	out[x++] = (unsigned char)(len&255);	×
77	} else {
78	/* coverity[dead_error_line] */
79	return CRYPT_INVALID_ARG;
80	}
81
82	/* store UTF8 */
83	for (y = 0; y < inlen; y++) {	7✔
84	switch (der_utf8_charsize(in[y])) {	7✔
85	case 1: out[x++] = (unsigned char)in[y]; break;	2✔
86	case 2: out[x++] = 0xC0 \| ((in[y] >> 6) & 0x1F); out[x++] = 0x80 \| (in[y] & 0x3F); break;	1✔
87	case 3: out[x++] = 0xE0 \| ((in[y] >> 12) & 0x0F); out[x++] = 0x80 \| ((in[y] >> 6) & 0x3F); out[x++] = 0x80 \| (in[y] & 0x3F); break;	4✔
88	#if !defined(LTC_WCHAR_MAX) \|\| LTC_WCHAR_MAX > 0xFFFF
89	case 4: out[x++] = 0xF0 \| ((in[y] >> 18) & 0x07); out[x++] = 0x80 \| ((in[y] >> 12) & 0x3F); out[x++] = 0x80 \| ((in[y] >> 6) & 0x3F); out[x++] = 0x80 \| (in[y] & 0x3F); break;	×
90	#endif
91	}
92	}
93
94	/* retun length */
95	*outlen = x;	2✔
96
97	return CRYPT_OK;	2✔
98	}
99
100	#endif
101
102	/* ref: $Format:%D$ */
103	/* git commit: $Format:%H$ */
104	/* commit time: $Format:%ai$ */

libtom / libtomcrypt / 1266

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