<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/25498">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">base64: reformat using Lindent to conform to our coding style<br><br>Change-Id: I2286fa0d2cba7c11359bb48329135dfcd0d8a948<br>---<br>M include/osmocom/core/base64.h<br>M src/base64.c<br>M tests/base64/base64_test.c<br>3 files changed, 159 insertions(+), 165 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/base64.h b/include/osmocom/core/base64.h</span><br><span>index f73db0d..86b862e 100644</span><br><span>--- a/include/osmocom/core/base64.h</span><br><span>+++ b/include/osmocom/core/base64.h</span><br><span>@@ -45,8 +45,8 @@</span><br><span> * \note Call this function with dlen = 0 to obtain the</span><br><span> * required buffer size in *olen</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_base64_encode( unsigned char *dst, size_t dlen, size_t *olen,</span><br><span style="color: hsl(0, 100%, 40%);">- const unsigned char *src, size_t slen );</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_base64_encode(unsigned char *dst, size_t dlen, size_t *olen,</span><br><span style="color: hsl(120, 100%, 40%);">+ const unsigned char *src, size_t slen);</span><br><span> </span><br><span> /**</span><br><span> * \brief Decode a base64-formatted buffer</span><br><span>@@ -65,8 +65,8 @@</span><br><span> * \note Call this function with *dst = NULL or dlen = 0 to obtain</span><br><span> * the required buffer size in *olen</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_base64_decode( unsigned char *dst, size_t dlen, size_t *olen,</span><br><span style="color: hsl(0, 100%, 40%);">- const unsigned char *src, size_t slen );</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_base64_decode(unsigned char *dst, size_t dlen, size_t *olen,</span><br><span style="color: hsl(120, 100%, 40%);">+ const unsigned char *src, size_t slen);</span><br><span> </span><br><span> #ifdef __cplusplus</span><br><span> }</span><br><span>diff --git a/src/base64.c b/src/base64.c</span><br><span>index dbc908b..d86573e 100644</span><br><span>--- a/src/base64.c</span><br><span>+++ b/src/base64.c</span><br><span>@@ -26,178 +26,174 @@</span><br><span> #include <stdio.h></span><br><span> #include <errno.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const unsigned char base64_enc_map[64] =</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',</span><br><span style="color: hsl(0, 100%, 40%);">- 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',</span><br><span style="color: hsl(0, 100%, 40%);">- 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',</span><br><span style="color: hsl(0, 100%, 40%);">- 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',</span><br><span style="color: hsl(0, 100%, 40%);">- 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x',</span><br><span style="color: hsl(0, 100%, 40%);">- 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7',</span><br><span style="color: hsl(0, 100%, 40%);">- '8', '9', '+', '/'</span><br><span style="color: hsl(120, 100%, 40%);">+static const unsigned char base64_enc_map[64] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7',</span><br><span style="color: hsl(120, 100%, 40%);">+ '8', '9', '+', '/'</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const unsigned char base64_dec_map[128] =</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,</span><br><span style="color: hsl(0, 100%, 40%);">- 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,</span><br><span style="color: hsl(0, 100%, 40%);">- 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,</span><br><span style="color: hsl(0, 100%, 40%);">- 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,</span><br><span style="color: hsl(0, 100%, 40%);">- 127, 127, 127, 62, 127, 127, 127, 63, 52, 53,</span><br><span style="color: hsl(0, 100%, 40%);">- 54, 55, 56, 57, 58, 59, 60, 61, 127, 127,</span><br><span style="color: hsl(0, 100%, 40%);">- 127, 64, 127, 127, 127, 0, 1, 2, 3, 4,</span><br><span style="color: hsl(0, 100%, 40%);">- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,</span><br><span style="color: hsl(0, 100%, 40%);">- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,</span><br><span style="color: hsl(0, 100%, 40%);">- 25, 127, 127, 127, 127, 127, 127, 26, 27, 28,</span><br><span style="color: hsl(0, 100%, 40%);">- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,</span><br><span style="color: hsl(0, 100%, 40%);">- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,</span><br><span style="color: hsl(0, 100%, 40%);">- 49, 50, 51, 127, 127, 127, 127, 127</span><br><span style="color: hsl(120, 100%, 40%);">+static const unsigned char base64_dec_map[128] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,</span><br><span style="color: hsl(120, 100%, 40%);">+ 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,</span><br><span style="color: hsl(120, 100%, 40%);">+ 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,</span><br><span style="color: hsl(120, 100%, 40%);">+ 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,</span><br><span style="color: hsl(120, 100%, 40%);">+ 127, 127, 127, 62, 127, 127, 127, 63, 52, 53,</span><br><span style="color: hsl(120, 100%, 40%);">+ 54, 55, 56, 57, 58, 59, 60, 61, 127, 127,</span><br><span style="color: hsl(120, 100%, 40%);">+ 127, 64, 127, 127, 127, 0, 1, 2, 3, 4,</span><br><span style="color: hsl(120, 100%, 40%);">+ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,</span><br><span style="color: hsl(120, 100%, 40%);">+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,</span><br><span style="color: hsl(120, 100%, 40%);">+ 25, 127, 127, 127, 127, 127, 127, 26, 27, 28,</span><br><span style="color: hsl(120, 100%, 40%);">+ 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,</span><br><span style="color: hsl(120, 100%, 40%);">+ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,</span><br><span style="color: hsl(120, 100%, 40%);">+ 49, 50, 51, 127, 127, 127, 127, 127</span><br><span> };</span><br><span> </span><br><span> /*</span><br><span> * Encode a buffer into base64 format</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_base64_encode( unsigned char *dst, size_t dlen, size_t *olen,</span><br><span style="color: hsl(0, 100%, 40%);">- const unsigned char *src, size_t slen )</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_base64_encode(unsigned char *dst, size_t dlen, size_t *olen,</span><br><span style="color: hsl(120, 100%, 40%);">+ const unsigned char *src, size_t slen)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- size_t i, n;</span><br><span style="color: hsl(0, 100%, 40%);">- int C1, C2, C3;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned char *p;</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t i, n;</span><br><span style="color: hsl(120, 100%, 40%);">+ int C1, C2, C3;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned char *p;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if( slen == 0 )</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- *olen = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- return( 0 );</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (slen == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ *olen = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- n = ( slen << 3 ) / 6;</span><br><span style="color: hsl(120, 100%, 40%);">+ n = (slen << 3) / 6;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- switch( ( slen << 3 ) - ( n * 6 ) )</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- case 2: n += 3; break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 4: n += 2; break;</span><br><span style="color: hsl(0, 100%, 40%);">- default: break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ switch ((slen << 3) - (n * 6)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 2:</span><br><span style="color: hsl(120, 100%, 40%);">+ n += 3;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 4:</span><br><span style="color: hsl(120, 100%, 40%);">+ n += 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if( dlen < n + 1 )</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- *olen = n + 1;</span><br><span style="color: hsl(0, 100%, 40%);">- return( -ENOBUFS );</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dlen < n + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ *olen = n + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOBUFS;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- n = ( slen / 3 ) * 3;</span><br><span style="color: hsl(120, 100%, 40%);">+ n = (slen / 3) * 3;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for( i = 0, p = dst; i < n; i += 3 )</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- C1 = *src++;</span><br><span style="color: hsl(0, 100%, 40%);">- C2 = *src++;</span><br><span style="color: hsl(0, 100%, 40%);">- C3 = *src++;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0, p = dst; i < n; i += 3) {</span><br><span style="color: hsl(120, 100%, 40%);">+ C1 = *src++;</span><br><span style="color: hsl(120, 100%, 40%);">+ C2 = *src++;</span><br><span style="color: hsl(120, 100%, 40%);">+ C3 = *src++;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- *p++ = base64_enc_map[(C1 >> 2) & 0x3F];</span><br><span style="color: hsl(0, 100%, 40%);">- *p++ = base64_enc_map[(((C1 & 3) << 4) + (C2 >> 4)) & 0x3F];</span><br><span style="color: hsl(0, 100%, 40%);">- *p++ = base64_enc_map[(((C2 & 15) << 2) + (C3 >> 6)) & 0x3F];</span><br><span style="color: hsl(0, 100%, 40%);">- *p++ = base64_enc_map[C3 & 0x3F];</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ *p++ = base64_enc_map[(C1 >> 2) & 0x3F];</span><br><span style="color: hsl(120, 100%, 40%);">+ *p++ = base64_enc_map[(((C1 & 3) << 4) + (C2 >> 4)) & 0x3F];</span><br><span style="color: hsl(120, 100%, 40%);">+ *p++ = base64_enc_map[(((C2 & 15) << 2) + (C3 >> 6)) & 0x3F];</span><br><span style="color: hsl(120, 100%, 40%);">+ *p++ = base64_enc_map[C3 & 0x3F];</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if( i < slen )</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- C1 = *src++;</span><br><span style="color: hsl(0, 100%, 40%);">- C2 = ( ( i + 1 ) < slen ) ? *src++ : 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (i < slen) {</span><br><span style="color: hsl(120, 100%, 40%);">+ C1 = *src++;</span><br><span style="color: hsl(120, 100%, 40%);">+ C2 = ((i + 1) < slen) ? *src++ : 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- *p++ = base64_enc_map[(C1 >> 2) & 0x3F];</span><br><span style="color: hsl(0, 100%, 40%);">- *p++ = base64_enc_map[(((C1 & 3) << 4) + (C2 >> 4)) & 0x3F];</span><br><span style="color: hsl(120, 100%, 40%);">+ *p++ = base64_enc_map[(C1 >> 2) & 0x3F];</span><br><span style="color: hsl(120, 100%, 40%);">+ *p++ = base64_enc_map[(((C1 & 3) << 4) + (C2 >> 4)) & 0x3F];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if( ( i + 1 ) < slen )</span><br><span style="color: hsl(0, 100%, 40%);">- *p++ = base64_enc_map[((C2 & 15) << 2) & 0x3F];</span><br><span style="color: hsl(0, 100%, 40%);">- else *p++ = '=';</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((i + 1) < slen)</span><br><span style="color: hsl(120, 100%, 40%);">+ *p++ = base64_enc_map[((C2 & 15) << 2) & 0x3F];</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ *p++ = '=';</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- *p++ = '=';</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ *p++ = '=';</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- *olen = p - dst;</span><br><span style="color: hsl(0, 100%, 40%);">- *p = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ *olen = p - dst;</span><br><span style="color: hsl(120, 100%, 40%);">+ *p = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return( 0 );</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> /*</span><br><span> * Decode a base64-formatted buffer</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_base64_decode( unsigned char *dst, size_t dlen, size_t *olen,</span><br><span style="color: hsl(0, 100%, 40%);">- const unsigned char *src, size_t slen )</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_base64_decode(unsigned char *dst, size_t dlen, size_t *olen,</span><br><span style="color: hsl(120, 100%, 40%);">+ const unsigned char *src, size_t slen)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- size_t i, n;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t j, x;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned char *p;</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t i, n;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t j, x;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned char *p;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* First pass: check for validity and get output length */</span><br><span style="color: hsl(0, 100%, 40%);">- for( i = n = j = 0; i < slen; i++ )</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Skip spaces before checking for EOL */</span><br><span style="color: hsl(0, 100%, 40%);">- x = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- while( i < slen && src[i] == ' ' )</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- ++i;</span><br><span style="color: hsl(0, 100%, 40%);">- ++x;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* First pass: check for validity and get output length */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = n = j = 0; i < slen; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Skip spaces before checking for EOL */</span><br><span style="color: hsl(120, 100%, 40%);">+ x = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ while (i < slen && src[i] == ' ') {</span><br><span style="color: hsl(120, 100%, 40%);">+ ++i;</span><br><span style="color: hsl(120, 100%, 40%);">+ ++x;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Spaces at end of buffer are OK */</span><br><span style="color: hsl(0, 100%, 40%);">- if( i == slen )</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Spaces at end of buffer are OK */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (i == slen)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if( ( slen - i ) >= 2 &&</span><br><span style="color: hsl(0, 100%, 40%);">- src[i] == '\r' && src[i + 1] == '\n' )</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((slen - i) >= 2 && src[i] == '\r' && src[i + 1] == '\n')</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if( src[i] == '\n' )</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (src[i] == '\n')</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Space inside a line is an error */</span><br><span style="color: hsl(0, 100%, 40%);">- if( x != 0 )</span><br><span style="color: hsl(0, 100%, 40%);">- return( -EINVAL );</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Space inside a line is an error */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (x != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if( src[i] == '=' && ++j > 2 )</span><br><span style="color: hsl(0, 100%, 40%);">- return( -EINVAL );</span><br><span style="color: hsl(120, 100%, 40%);">+ if (src[i] == '=' && ++j > 2)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if( src[i] > 127 || base64_dec_map[src[i]] == 127 )</span><br><span style="color: hsl(0, 100%, 40%);">- return( -EINVAL );</span><br><span style="color: hsl(120, 100%, 40%);">+ if (src[i] > 127 || base64_dec_map[src[i]] == 127)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if( base64_dec_map[src[i]] < 64 && j != 0 )</span><br><span style="color: hsl(0, 100%, 40%);">- return( -EINVAL );</span><br><span style="color: hsl(120, 100%, 40%);">+ if (base64_dec_map[src[i]] < 64 && j != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- n++;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ n++;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if( n == 0 )</span><br><span style="color: hsl(0, 100%, 40%);">- return( 0 );</span><br><span style="color: hsl(120, 100%, 40%);">+ if (n == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- n = ( ( n * 6 ) + 7 ) >> 3;</span><br><span style="color: hsl(0, 100%, 40%);">- n -= j;</span><br><span style="color: hsl(120, 100%, 40%);">+ n = ((n * 6) + 7) >> 3;</span><br><span style="color: hsl(120, 100%, 40%);">+ n -= j;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if( dst == NULL || dlen < n )</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- *olen = n;</span><br><span style="color: hsl(0, 100%, 40%);">- return( -ENOBUFS );</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dst == NULL || dlen < n) {</span><br><span style="color: hsl(120, 100%, 40%);">+ *olen = n;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOBUFS;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for( j = 3, n = x = 0, p = dst; i > 0; i--, src++ )</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- if( *src == '\r' || *src == '\n' || *src == ' ' )</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (j = 3, n = x = 0, p = dst; i > 0; i--, src++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (*src == '\r' || *src == '\n' || *src == ' ')</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- j -= ( base64_dec_map[*src] == 64 );</span><br><span style="color: hsl(0, 100%, 40%);">- x = ( x << 6 ) | ( base64_dec_map[*src] & 0x3F );</span><br><span style="color: hsl(120, 100%, 40%);">+ j -= (base64_dec_map[*src] == 64);</span><br><span style="color: hsl(120, 100%, 40%);">+ x = (x << 6) | (base64_dec_map[*src] & 0x3F);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if( ++n == 4 )</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- n = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- if( j > 0 ) *p++ = (unsigned char)( x >> 16 );</span><br><span style="color: hsl(0, 100%, 40%);">- if( j > 1 ) *p++ = (unsigned char)( x >> 8 );</span><br><span style="color: hsl(0, 100%, 40%);">- if( j > 2 ) *p++ = (unsigned char)( x );</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (++n == 4) {</span><br><span style="color: hsl(120, 100%, 40%);">+ n = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (j > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ *p++ = (unsigned char)(x >> 16);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (j > 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ *p++ = (unsigned char)(x >> 8);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (j > 2)</span><br><span style="color: hsl(120, 100%, 40%);">+ *p++ = (unsigned char)(x);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- *olen = p - dst;</span><br><span style="color: hsl(120, 100%, 40%);">+ *olen = p - dst;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return( 0 );</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span>diff --git a/tests/base64/base64_test.c b/tests/base64/base64_test.c</span><br><span>index e85f649..79ec212 100644</span><br><span>--- a/tests/base64/base64_test.c</span><br><span>+++ b/tests/base64/base64_test.c</span><br><span>@@ -1,17 +1,17 @@</span><br><span> #include <osmocom/core/base64.h></span><br><span> #include <stdio.h></span><br><span> #include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdlib.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const unsigned char base64_test_dec[64] =</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- 0x24, 0x48, 0x6E, 0x56, 0x87, 0x62, 0x5A, 0xBD,</span><br><span style="color: hsl(0, 100%, 40%);">- 0xBF, 0x17, 0xD9, 0xA2, 0xC4, 0x17, 0x1A, 0x01,</span><br><span style="color: hsl(0, 100%, 40%);">- 0x94, 0xED, 0x8F, 0x1E, 0x11, 0xB3, 0xD7, 0x09,</span><br><span style="color: hsl(0, 100%, 40%);">- 0x0C, 0xB6, 0xE9, 0x10, 0x6F, 0x22, 0xEE, 0x13,</span><br><span style="color: hsl(0, 100%, 40%);">- 0xCA, 0xB3, 0x07, 0x05, 0x76, 0xC9, 0xFA, 0x31,</span><br><span style="color: hsl(0, 100%, 40%);">- 0x6C, 0x08, 0x34, 0xFF, 0x8D, 0xC2, 0x6C, 0x38,</span><br><span style="color: hsl(0, 100%, 40%);">- 0x00, 0x43, 0xE9, 0x54, 0x97, 0xAF, 0x50, 0x4B,</span><br><span style="color: hsl(0, 100%, 40%);">- 0xD1, 0x41, 0xBA, 0x95, 0x31, 0x5A, 0x0B, 0x97</span><br><span style="color: hsl(120, 100%, 40%);">+static const unsigned char base64_test_dec[64] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x24, 0x48, 0x6E, 0x56, 0x87, 0x62, 0x5A, 0xBD,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0xBF, 0x17, 0xD9, 0xA2, 0xC4, 0x17, 0x1A, 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x94, 0xED, 0x8F, 0x1E, 0x11, 0xB3, 0xD7, 0x09,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x0C, 0xB6, 0xE9, 0x10, 0x6F, 0x22, 0xEE, 0x13,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0xCA, 0xB3, 0x07, 0x05, 0x76, 0xC9, 0xFA, 0x31,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x6C, 0x08, 0x34, 0xFF, 0x8D, 0xC2, 0x6C, 0x38,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x00, 0x43, 0xE9, 0x54, 0x97, 0xAF, 0x50, 0x4B,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0xD1, 0x41, 0xBA, 0x95, 0x31, 0x5A, 0x0B, 0x97</span><br><span> };</span><br><span> </span><br><span> static const unsigned char base64_test_enc[] =</span><br><span>@@ -23,35 +23,33 @@</span><br><span> */</span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- size_t len;</span><br><span style="color: hsl(0, 100%, 40%);">- const unsigned char *src;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned char buffer[128];</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t len;</span><br><span style="color: hsl(120, 100%, 40%);">+ const unsigned char *src;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned char buffer[128];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf( " Base64 encoding test: " );</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" Base64 encoding test: ");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- src = base64_test_dec;</span><br><span style="color: hsl(120, 100%, 40%);">+ src = base64_test_dec;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if( osmo_base64_encode( buffer, sizeof( buffer ), &len, src, 64 ) != 0 ||</span><br><span style="color: hsl(0, 100%, 40%);">- memcmp( base64_test_enc, buffer, 88 ) != 0 )</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- printf( "failed\n" );</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_base64_encode(buffer, sizeof(buffer), &len, src, 64) != 0 ||</span><br><span style="color: hsl(120, 100%, 40%);">+ memcmp(base64_test_enc, buffer, 88) != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("failed\n");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return( 1 );</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf( "passed\n Base64 decoding test: " );</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("passed\n Base64 decoding test: ");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- src = base64_test_enc;</span><br><span style="color: hsl(120, 100%, 40%);">+ src = base64_test_enc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if( osmo_base64_decode( buffer, sizeof( buffer ), &len, src, 88 ) != 0 ||</span><br><span style="color: hsl(0, 100%, 40%);">- memcmp( base64_test_dec, buffer, 64 ) != 0 )</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- printf( "failed\n" );</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_base64_decode(buffer, sizeof(buffer), &len, src, 88) != 0 ||</span><br><span style="color: hsl(120, 100%, 40%);">+ memcmp(base64_test_dec, buffer, 64) != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("failed\n");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return( 1 );</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf( "passed\n\n" );</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("passed\n\n");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return( 0 );</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(0);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/25498">change 25498</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmocore/+/25498"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2286fa0d2cba7c11359bb48329135dfcd0d8a948 </div>
<div style="display:none"> Gerrit-Change-Number: 25498 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>