You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by yl...@apache.org on 2019/03/26 08:17:41 UTC
svn commit: r1856271 - in /apr/apr/branches/1.7.x: ./ test/testencode.c
Author: ylavic
Date: Tue Mar 26 08:17:41 2019
New Revision: 1856271
URL: http://svn.apache.org/viewvc?rev=1856271&view=rev
Log:
Merge r1856096, r1856178 from trunk:
testencode: fix compilation on VS.
testencode: better fix compilation on VS.
Modified:
apr/apr/branches/1.7.x/ (props changed)
apr/apr/branches/1.7.x/test/testencode.c
Propchange: apr/apr/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 26 08:17:41 2019
@@ -1,4 +1,4 @@
/apr/apr/branches/1.4.x:1003369,1101301
-/apr/apr/trunk:733052,739635,741862,741866-741867,741869,741871,745763-745764,746310,747990,748080,748361,748371,748565,748888,748902,748988,749810,760443,767895,775683,782838,783398,783958,784633,784773,788588,789050,793192-793193,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,832904,835607,888669,892028,892159,892435,892909,896382,896653,899905,901088,902077,902090,908427,910419,910597,917819,917837-917838,923311,923320,925965,929796,930508,931973,932585,951771,960665,960671,979891,983618,989450,990435,1003338,1044440,1044447,1055657,1072165,1078845,1081462,1081495,1083038,1083242,1084662,1086695,1088023,1089031,1089129,1089438,1099348,1103310,1183683,1183685-1183686,1183688,1183693,1183698,1213382,1235047,1236970,1237078,1237507,1240472,1340286,1340288,1340470,1341193,1341196,1343233,1343243,1367050,1368819,1370494,1372018,1372022,1372093,1372849,1376957,1384764,1389077,1400200,1402868,1405985,1406690,1420106,1420109,1425356,1428809,143
8940,1438957-1438959,1442903,1449568,1456418,1459994,1460179-1460180,1460241,1460399,1460405,1462738,1462813,1470186,1470348,1475509,1478905,1480067,1481262,1481265,1484271,1487796,1489517,1496407,1502804,1510354,1516261,1523384,1523479,1523484,1523505,1523521,1523604,1523613,1523615,1523844-1523845,1523853,1524014,1524031,1528797,1528809,1529488,1529495,1529515,1529521,1529668,1530786,1530800,1530988,1531554,1531768,1531884,1532022,1533104,1533111,1533979,1534882,1535027,1535157,1536744,1538171,1539374,1539389,1539455,1539603,1541054,1541061,1541486,1541655,1541666,1541744,1542601,1542779,1543033,1543056,1548575,1550907,1551650,1551659,1558905,1559382,1559873,1559975,1561040,1561260,1561265,1561321,1561347,1561356,1561361,1561394,1561555,1571894,1575509,1578420,1587045,1587063,1587543,1587545,1588878,1588937,1589982,1593611,1593614-1593615,1593680,1594684,1594708,1595549,1597797,1597803,1604590,1604596,1604598,1605104,1610854,1611023,1611107,1611110,1611117,1611120,1611125,1611184,
1611193,1611466,1611515,1611517,1625173,1626564,1634615,1642159,1648830,1664406,1664447,1664451,1664471,1664769-1664770,1664775,1664904,1664911,1664958,1666341,1666411,1666458,1666611,1667420-1667421,1667423,1667900-1667901,1667903,1667914-1667916,1667962,1669077,1671292,1671329,1671356,1671386,1671389,1671513-1671514,1671957,1672354,1672366,1672495,1672575,1675644,1675656,1675668,1676013,1683521,1685929,1696140,1696767,1722547,1722557,1726928,1727020,1727160,1727175,1727199,1728957,1732582,1733451,1733594,1733694,1733706,1733708,1733775,1734816,1736552,1738791,1738925,1750374,1755709,1755740,1755746,1755758,1755954,1761279,1762326,1774712,1774973,1775069,1776994,1776998,1788334,1788337,1788929,1789947,1789998,1790045,1790200,1790296,1790302-1790304,1790330-1790331,1790436,1790439,1790444,1790446,1790488,1790521,1790523,1790569,1790632,1791598,1791718,1791728,1792620-1792622,1792625,1792961,1792963,1794266,1797415,1798105,1805380,1808039,1808836,1808910,1809649,1810452,1813286,18133
30,1814239-1814240,1814326,1814329,1814331,1816527,1816628,1817485,1819857-1819858,1819860-1819861,1819934-1819935,1820080,1820755,1822357,1827534,1832203,1832691,1832985,1834253,1834494,1834541,1836235,1839068,1839493,1839622,1839769,1840372,1841078,1846806,1850087,1850095,1851541-1851542,1854123,1855049,1855347,1855443-1855444,1855839-1855840,1855855,1855864,1855867,1855877,1855949,1856022,1856042-1856043,1856046,1856050,1856063,1856089
+/apr/apr/trunk:733052,739635,741862,741866-741867,741869,741871,745763-745764,746310,747990,748080,748361,748371,748565,748888,748902,748988,749810,760443,767895,775683,782838,783398,783958,784633,784773,788588,789050,793192-793193,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,832904,835607,888669,892028,892159,892435,892909,896382,896653,899905,901088,902077,902090,908427,910419,910597,917819,917837-917838,923311,923320,925965,929796,930508,931973,932585,951771,960665,960671,979891,983618,989450,990435,1003338,1044440,1044447,1055657,1072165,1078845,1081462,1081495,1083038,1083242,1084662,1086695,1088023,1089031,1089129,1089438,1099348,1103310,1183683,1183685-1183686,1183688,1183693,1183698,1213382,1235047,1236970,1237078,1237507,1240472,1340286,1340288,1340470,1341193,1341196,1343233,1343243,1367050,1368819,1370494,1372018,1372022,1372093,1372849,1376957,1384764,1389077,1400200,1402868,1405985,1406690,1420106,1420109,1425356,1428809,143
8940,1438957-1438959,1442903,1449568,1456418,1459994,1460179-1460180,1460241,1460399,1460405,1462738,1462813,1470186,1470348,1475509,1478905,1480067,1481262,1481265,1484271,1487796,1489517,1496407,1502804,1510354,1516261,1523384,1523479,1523484,1523505,1523521,1523604,1523613,1523615,1523844-1523845,1523853,1524014,1524031,1528797,1528809,1529488,1529495,1529515,1529521,1529668,1530786,1530800,1530988,1531554,1531768,1531884,1532022,1533104,1533111,1533979,1534882,1535027,1535157,1536744,1538171,1539374,1539389,1539455,1539603,1541054,1541061,1541486,1541655,1541666,1541744,1542601,1542779,1543033,1543056,1548575,1550907,1551650,1551659,1558905,1559382,1559873,1559975,1561040,1561260,1561265,1561321,1561347,1561356,1561361,1561394,1561555,1571894,1575509,1578420,1587045,1587063,1587543,1587545,1588878,1588937,1589982,1593611,1593614-1593615,1593680,1594684,1594708,1595549,1597797,1597803,1604590,1604596,1604598,1605104,1610854,1611023,1611107,1611110,1611117,1611120,1611125,1611184,
1611193,1611466,1611515,1611517,1625173,1626564,1634615,1642159,1648830,1664406,1664447,1664451,1664471,1664769-1664770,1664775,1664904,1664911,1664958,1666341,1666411,1666458,1666611,1667420-1667421,1667423,1667900-1667901,1667903,1667914-1667916,1667962,1669077,1671292,1671329,1671356,1671386,1671389,1671513-1671514,1671957,1672354,1672366,1672495,1672575,1675644,1675656,1675668,1676013,1683521,1685929,1696140,1696767,1722547,1722557,1726928,1727020,1727160,1727175,1727199,1728957,1732582,1733451,1733594,1733694,1733706,1733708,1733775,1734816,1736552,1738791,1738925,1750374,1755709,1755740,1755746,1755758,1755954,1761279,1762326,1774712,1774973,1775069,1776994,1776998,1788334,1788337,1788929,1789947,1789998,1790045,1790200,1790296,1790302-1790304,1790330-1790331,1790436,1790439,1790444,1790446,1790488,1790521,1790523,1790569,1790632,1791598,1791718,1791728,1792620-1792622,1792625,1792961,1792963,1794266,1797415,1798105,1805380,1808039,1808836,1808910,1809649,1810452,1813286,18133
30,1814239-1814240,1814326,1814329,1814331,1816527,1816628,1817485,1819857-1819858,1819860-1819861,1819934-1819935,1820080,1820755,1822357,1827534,1832203,1832691,1832985,1834253,1834494,1834541,1836235,1839068,1839493,1839622,1839769,1840372,1841078,1846806,1850087,1850095,1851541-1851542,1854123,1855049,1855347,1855443-1855444,1855839-1855840,1855855,1855864,1855867,1855877,1855949,1856022,1856042-1856043,1856046,1856050,1856063,1856089,1856096,1856178
/apr/apr/trunk/test/testnames.c:1460405
/httpd/httpd/trunk:1604590
Modified: apr/apr/branches/1.7.x/test/testencode.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/test/testencode.c?rev=1856271&r1=1856270&r2=1856271&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/test/testencode.c (original)
+++ apr/apr/branches/1.7.x/test/testencode.c Tue Mar 26 08:17:41 2019
@@ -24,6 +24,8 @@
#include "abts.h"
#include "testutil.h"
+static const unsigned char ufoobar[] = { 'f', 'o', 'o', 'b', 'a', 'r' };
+
static void test_encode_base64(abts_case * tc, void *data)
{
apr_pool_t *pool;
@@ -78,7 +80,6 @@ static void test_encode_base64_binary(ab
{
apr_pool_t *pool;
const char *target;
- const unsigned char *usrc;
const char *dest;
apr_size_t len;
@@ -87,52 +88,32 @@ static void test_encode_base64_binary(ab
/*
* Test vectors from https://tools.ietf.org/html/rfc4648#section-10
*/
- usrc = (unsigned char[]){
- };
target = "";
- dest = apr_pencode_base64_binary(pool, usrc, 0, APR_ENCODE_NONE, &len);
+ dest = apr_pencode_base64_binary(pool, ufoobar, 0, APR_ENCODE_NONE, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f'
- };
target = "Zg==";
- dest = apr_pencode_base64_binary(pool, usrc, 1, APR_ENCODE_NONE, &len);
+ dest = apr_pencode_base64_binary(pool, ufoobar, 1, APR_ENCODE_NONE, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f'
- };
target = "Zg";
- dest = apr_pencode_base64_binary(pool, usrc, 1, APR_ENCODE_NOPADDING, &len);
+ dest = apr_pencode_base64_binary(pool, ufoobar, 1, APR_ENCODE_NOPADDING, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o'
- };
target = "Zm8=";
- dest = apr_pencode_base64_binary(pool, usrc, 2, APR_ENCODE_NONE, &len);
+ dest = apr_pencode_base64_binary(pool, ufoobar, 2, APR_ENCODE_NONE, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o'
- };
target = "Zm8";
- dest = apr_pencode_base64_binary(pool, usrc, 2, APR_ENCODE_NOPADDING, &len);
+ dest = apr_pencode_base64_binary(pool, ufoobar, 2, APR_ENCODE_NOPADDING, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o', 'o'
- };
target = "Zm9v";
- dest = apr_pencode_base64_binary(pool, usrc, 3, APR_ENCODE_NONE, &len);
+ dest = apr_pencode_base64_binary(pool, ufoobar, 3, APR_ENCODE_NONE, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o', 'o'
- };
target = "Zm9v";
- dest = apr_pencode_base64_binary(pool, usrc, 3, APR_ENCODE_NOPADDING, &len);
+ dest = apr_pencode_base64_binary(pool, ufoobar, 3, APR_ENCODE_NOPADDING, &len);
ABTS_STR_EQUAL(tc, target, dest);
apr_pool_destroy(pool);
@@ -192,7 +173,6 @@ static void test_decode_base64_binary(ab
{
apr_pool_t *pool;
const char *src;
- const unsigned char *utarget;
const unsigned char *udest;
apr_size_t len;
@@ -202,58 +182,38 @@ static void test_decode_base64_binary(ab
* Test vectors from https://tools.ietf.org/html/rfc4648#section-10
*/
src = "";
- utarget = (unsigned char[]){
- };
udest = apr_pdecode_base64_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base64_binary target!=dest", memcmp(utarget, udest, 0) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base64_binary target!=dest", memcmp(ufoobar, udest, 0) == 0);
ABTS_INT_EQUAL(tc, len, 0);
src = "Zg==";
- utarget = (unsigned char[]){
- 'f'
- };
udest = apr_pdecode_base64_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base64_binary target!=dest", memcmp(utarget, udest, 1) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base64_binary target!=dest", memcmp(ufoobar, udest, 1) == 0);
ABTS_INT_EQUAL(tc, len, 1);
src = "Zg";
- utarget = (unsigned char[]){
- 'f'
- };
udest = apr_pdecode_base64_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base64_binary target!=dest", memcmp(utarget, udest, 1) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base64_binary target!=dest", memcmp(ufoobar, udest, 1) == 0);
ABTS_INT_EQUAL(tc, len, 1);
src = "Zm8=";
- utarget = (unsigned char[]){
- 'f', 'o'
- };
udest = apr_pdecode_base64_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base64_binary target!=dest", memcmp(utarget, udest, 2) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base64_binary target!=dest", memcmp(ufoobar, udest, 2) == 0);
ABTS_INT_EQUAL(tc, len, 2);
src = "Zm8";
- utarget = (unsigned char[]){
- 'f', 'o'
- };
udest = apr_pdecode_base64_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base64_binary target!=dest", memcmp(utarget, udest, 2) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base64_binary target!=dest", memcmp(ufoobar, udest, 2) == 0);
ABTS_INT_EQUAL(tc, len, 2);
src = "Zm9v";
- utarget = (unsigned char[]){
- 'f', 'o', 'o'
- };
udest = apr_pdecode_base64_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base64_binary target!=dest", memcmp(utarget, udest, 3) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base64_binary target!=dest", memcmp(ufoobar, udest, 3) == 0);
ABTS_INT_EQUAL(tc, len, 3);
src = "Zm9v";
- utarget = (unsigned char[]){
- 'f', 'o', 'o'
- };
udest = apr_pdecode_base64_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base64_binary target!=dest", memcmp(utarget, udest, 3) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base64_binary target!=dest", memcmp(ufoobar, udest, 3) == 0);
ABTS_INT_EQUAL(tc, len, 3);
apr_pool_destroy(pool);
@@ -403,7 +363,6 @@ static void test_encode_base32_binary(ab
{
apr_pool_t *pool;
const char *target;
- const unsigned char *usrc;
const char *dest;
apr_size_t len;
@@ -412,178 +371,104 @@ static void test_encode_base32_binary(ab
/*
* Test vectors from https://tools.ietf.org/html/rfc4648#section-10
*/
- usrc = (unsigned char[]){
- };
target = "";
- dest = apr_pencode_base32_binary(pool, usrc, 0, APR_ENCODE_NONE, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 0, APR_ENCODE_NONE, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f'
- };
target = "MY======";
- dest = apr_pencode_base32_binary(pool, usrc, 1, APR_ENCODE_NONE, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 1, APR_ENCODE_NONE, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f'
- };
target = "MY";
- dest = apr_pencode_base32_binary(pool, usrc, 1, APR_ENCODE_NOPADDING, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 1, APR_ENCODE_NOPADDING, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f'
- };
target = "CO======";
- dest = apr_pencode_base32_binary(pool, usrc, 1, APR_ENCODE_BASE32HEX, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 1, APR_ENCODE_BASE32HEX, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f'
- };
target = "CO";
- dest = apr_pencode_base32_binary(pool, usrc, 1, APR_ENCODE_BASE32HEX | APR_ENCODE_NOPADDING, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 1, APR_ENCODE_BASE32HEX | APR_ENCODE_NOPADDING, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o'
- };
target = "MZXQ====";
- dest = apr_pencode_base32_binary(pool, usrc, 2, APR_ENCODE_NONE, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 2, APR_ENCODE_NONE, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o'
- };
target = "MZXQ";
- dest = apr_pencode_base32_binary(pool, usrc, 2, APR_ENCODE_NOPADDING, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 2, APR_ENCODE_NOPADDING, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o'
- };
target = "CPNG====";
- dest = apr_pencode_base32_binary(pool, usrc, 2, APR_ENCODE_BASE32HEX, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 2, APR_ENCODE_BASE32HEX, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o'
- };
target = "CPNG";
- dest = apr_pencode_base32_binary(pool, usrc, 2, APR_ENCODE_BASE32HEX | APR_ENCODE_NOPADDING, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 2, APR_ENCODE_BASE32HEX | APR_ENCODE_NOPADDING, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o', 'o'
- };
target = "MZXW6===";
- dest = apr_pencode_base32_binary(pool, usrc, 3, APR_ENCODE_NONE, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 3, APR_ENCODE_NONE, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o', 'o'
- };
target = "MZXW6";
- dest = apr_pencode_base32_binary(pool, usrc, 3, APR_ENCODE_NOPADDING, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 3, APR_ENCODE_NOPADDING, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o', 'o'
- };
target = "CPNMU===";
- dest = apr_pencode_base32_binary(pool, usrc, 3, APR_ENCODE_BASE32HEX, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 3, APR_ENCODE_BASE32HEX, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o', 'o'
- };
target = "CPNMU";
- dest = apr_pencode_base32_binary(pool, usrc, 3, APR_ENCODE_BASE32HEX | APR_ENCODE_NOPADDING, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 3, APR_ENCODE_BASE32HEX | APR_ENCODE_NOPADDING, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o', 'o', 'b'
- };
target = "MZXW6YQ=";
- dest = apr_pencode_base32_binary(pool, usrc, 4, APR_ENCODE_NONE, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 4, APR_ENCODE_NONE, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o', 'o', 'b'
- };
target = "MZXW6YQ";
- dest = apr_pencode_base32_binary(pool, usrc, 4, APR_ENCODE_NOPADDING, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 4, APR_ENCODE_NOPADDING, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o', 'o', 'b'
- };
target = "CPNMUOG=";
- dest = apr_pencode_base32_binary(pool, usrc, 4, APR_ENCODE_BASE32HEX, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 4, APR_ENCODE_BASE32HEX, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o', 'o', 'b'
- };
target = "CPNMUOG";
- dest = apr_pencode_base32_binary(pool, usrc, 4, APR_ENCODE_BASE32HEX | APR_ENCODE_NOPADDING, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 4, APR_ENCODE_BASE32HEX | APR_ENCODE_NOPADDING, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o', 'o', 'b', 'a'
- };
target = "MZXW6YTB";
- dest = apr_pencode_base32_binary(pool, usrc, 5, APR_ENCODE_NONE, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 5, APR_ENCODE_NONE, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o', 'o', 'b', 'a'
- };
target = "MZXW6YTB";
- dest = apr_pencode_base32_binary(pool, usrc, 5, APR_ENCODE_NOPADDING, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 5, APR_ENCODE_NOPADDING, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o', 'o', 'b', 'a'
- };
target = "CPNMUOJ1";
- dest = apr_pencode_base32_binary(pool, usrc, 5, APR_ENCODE_BASE32HEX, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 5, APR_ENCODE_BASE32HEX, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o', 'o', 'b', 'a'
- };
target = "CPNMUOJ1";
- dest = apr_pencode_base32_binary(pool, usrc, 5, APR_ENCODE_BASE32HEX | APR_ENCODE_NOPADDING, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 5, APR_ENCODE_BASE32HEX | APR_ENCODE_NOPADDING, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o', 'o', 'b', 'a', 'r'
- };
target = "MZXW6YTBOI======";
- dest = apr_pencode_base32_binary(pool, usrc, 6, APR_ENCODE_NONE, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 6, APR_ENCODE_NONE, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o', 'o', 'b', 'a', 'r'
- };
target = "MZXW6YTBOI";
- dest = apr_pencode_base32_binary(pool, usrc, 6, APR_ENCODE_NOPADDING, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 6, APR_ENCODE_NOPADDING, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o', 'o', 'b', 'a', 'r'
- };
target = "CPNMUOJ1E8======";
- dest = apr_pencode_base32_binary(pool, usrc, 6, APR_ENCODE_BASE32HEX, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 6, APR_ENCODE_BASE32HEX, &len);
ABTS_STR_EQUAL(tc, target, dest);
- usrc = (unsigned char[]){
- 'f', 'o', 'o', 'b', 'a', 'r'
- };
target = "CPNMUOJ1E8";
- dest = apr_pencode_base32_binary(pool, usrc, 6, APR_ENCODE_BASE32HEX | APR_ENCODE_NOPADDING, &len);
+ dest = apr_pencode_base32_binary(pool, ufoobar, 6, APR_ENCODE_BASE32HEX | APR_ENCODE_NOPADDING, &len);
ABTS_STR_EQUAL(tc, target, dest);
apr_pool_destroy(pool);
@@ -733,7 +618,6 @@ static void test_decode_base32_binary(ab
{
apr_pool_t *pool;
const char *src;
- const unsigned char *utarget;
const unsigned char *udest;
apr_size_t len;
@@ -743,202 +627,128 @@ static void test_decode_base32_binary(ab
* Test vectors from https://tools.ietf.org/html/rfc4648#section-10
*/
src = "";
- utarget = (unsigned char[]){
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 0) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 0) == 0);
ABTS_INT_EQUAL(tc, 0, len);
src = "MY======";
- utarget = (unsigned char[]){
- 'f'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 1) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 1) == 0);
ABTS_INT_EQUAL(tc, 1, len);
src = "MY";
- utarget = (unsigned char[]){
- 'f'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 1) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 1) == 0);
ABTS_INT_EQUAL(tc, 1, len);
src = "CO======";
- utarget = (unsigned char[]){
- 'f'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_BASE32HEX, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 1) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 1) == 0);
ABTS_INT_EQUAL(tc, 1, len);
src = "CO";
- utarget = (unsigned char[]){
- 'f'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_BASE32HEX, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 1) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 1) == 0);
ABTS_INT_EQUAL(tc, 1, len);
src = "MZXQ====";
- utarget = (unsigned char[]){
- 'f', 'o'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 2) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 2) == 0);
ABTS_INT_EQUAL(tc, 2, len);
src = "MZXQ";
- utarget = (unsigned char[]){
- 'f', 'o'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 2) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 2) == 0);
ABTS_INT_EQUAL(tc, 2, len);
src = "CPNG====";
- utarget = (unsigned char[]){
- 'f', 'o'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_BASE32HEX, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 2) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 2) == 0);
ABTS_INT_EQUAL(tc, 2, len);
src = "CPNG";
- utarget = (unsigned char[]){
- 'f', 'o'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_BASE32HEX, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 2) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 2) == 0);
ABTS_INT_EQUAL(tc, 2, len);
src = "MZXW6===";
- utarget = (unsigned char[]){
- 'f', 'o', 'o'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 3) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 3) == 0);
ABTS_INT_EQUAL(tc, 3, len);
src = "MZXW6";
- utarget = (unsigned char[]){
- 'f', 'o', 'o'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 3) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 3) == 0);
ABTS_INT_EQUAL(tc, 3, len);
src = "CPNMU===";
- utarget = (unsigned char[]){
- 'f', 'o', 'o'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_BASE32HEX, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 3) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 3) == 0);
ABTS_INT_EQUAL(tc, 3, len);
src = "CPNMU";
- utarget = (unsigned char[]){
- 'f', 'o', 'o'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_BASE32HEX, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 3) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 3) == 0);
ABTS_INT_EQUAL(tc, 3, len);
src = "MZXW6YQ=";
- utarget = (unsigned char[]){
- 'f', 'o', 'o', 'b'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 4) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 4) == 0);
ABTS_INT_EQUAL(tc, 4, len);
src = "MZXW6YQ=";
- utarget = (unsigned char[]){
- 'f', 'o', 'o', 'b'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 4) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 4) == 0);
ABTS_INT_EQUAL(tc, 4, len);
src = "CPNMUOG=";
- utarget = (unsigned char[]){
- 'f', 'o', 'o', 'b'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_BASE32HEX, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 4) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 4) == 0);
ABTS_INT_EQUAL(tc, 4, len);
src = "CPNMUOG";
- utarget = (unsigned char[]){
- 'f', 'o', 'o', 'b'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_BASE32HEX, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 4) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 4) == 0);
ABTS_INT_EQUAL(tc, 4, len);
src = "MZXW6YTB";
- utarget = (unsigned char[]){
- 'f', 'o', 'o', 'b', 'a'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 5) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 5) == 0);
ABTS_INT_EQUAL(tc, 5, len);
src = "MZXW6YTB";
- utarget = (unsigned char[]){
- 'f', 'o', 'o', 'b', 'a'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 5) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 5) == 0);
ABTS_INT_EQUAL(tc, 5, len);
src = "CPNMUOJ1";
- utarget = (unsigned char[]){
- 'f', 'o', 'o', 'b', 'a'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_BASE32HEX, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 5) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 5) == 0);
ABTS_INT_EQUAL(tc, 5, len);
src = "CPNMUOJ1";
- utarget = (unsigned char[]){
- 'f', 'o', 'o', 'b', 'a'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_BASE32HEX, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 5) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 5) == 0);
ABTS_INT_EQUAL(tc, 5, len);
src = "MZXW6YTBOI======";
- utarget = (unsigned char[]){
- 'f', 'o', 'o', 'b', 'a', 'r'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 6) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 6) == 0);
ABTS_INT_EQUAL(tc, 6, len);
src = "MZXW6YTBOI";
- utarget = (unsigned char[]){
- 'f', 'o', 'o', 'b', 'a', 'r'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_NONE, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 6) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 6) == 0);
ABTS_INT_EQUAL(tc, 6, len);
src = "CPNMUOJ1E8======";
- utarget = (unsigned char[]){
- 'f', 'o', 'o', 'b', 'a', 'r'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_BASE32HEX, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 6) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 6) == 0);
ABTS_INT_EQUAL(tc, 6, len);
src = "CPNMUOJ1E8";
- utarget = (unsigned char[]){
- 'f', 'o', 'o', 'b', 'a', 'r'
- };
udest = apr_pdecode_base32_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_BASE32HEX, &len);
- ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(utarget, udest, 6) == 0);
+ ABTS_ASSERT(tc, "apr_pdecode_base32_binary target!=dest", memcmp(ufoobar, udest, 6) == 0);
ABTS_INT_EQUAL(tc, 6, len);
apr_pool_destroy(pool);
@@ -996,15 +806,14 @@ static void test_encode_base16_binary(ab
{
apr_pool_t *pool;
const char *target;
- const unsigned char *usrc;
+ const unsigned char usrc[] = {
+ 0xFF, 0x00, 0xFF, 0x00
+ };
const char *dest;
apr_size_t len;
apr_pool_create(&pool, NULL);
- usrc = (unsigned char[]){
- 0xFF, 0x00, 0xFF, 0x00
- };
target = "ff00ff00";
dest = apr_pencode_base16_binary(pool, usrc, 4, APR_ENCODE_LOWER, &len);
ABTS_STR_EQUAL(tc, target, dest);
@@ -1013,9 +822,6 @@ static void test_encode_base16_binary(ab
apr_psprintf(pool, "size mismatch (%" APR_SIZE_T_FMT "!=%" APR_SIZE_T_FMT ")", len, strlen(dest) + 1),
(len == strlen(dest) + 1));
- usrc = (unsigned char[]){
- 0xFF, 0x00, 0xFF, 0x00
- };
target = "FF00FF00";
dest = apr_pencode_base16_binary(pool, usrc, 4, APR_ENCODE_NONE, &len);
ABTS_STR_EQUAL(tc, target, dest);
@@ -1024,9 +830,6 @@ static void test_encode_base16_binary(ab
apr_psprintf(pool, "size mismatch (%" APR_SIZE_T_FMT "!=%" APR_SIZE_T_FMT ")", len, strlen(dest) + 1),
(len == strlen(dest) + 1));
- usrc = (unsigned char[]){
- 0xFF, 0x00, 0xFF, 0x00
- };
target = "ff:00:ff:00";
dest = apr_pencode_base16_binary(pool, usrc, 4, APR_ENCODE_COLON | APR_ENCODE_LOWER, &len);
ABTS_STR_EQUAL(tc, target, dest);
@@ -1035,9 +838,6 @@ static void test_encode_base16_binary(ab
apr_psprintf(pool, "size mismatch (%" APR_SIZE_T_FMT "!=%" APR_SIZE_T_FMT ")", len, strlen(dest) + 1),
(len == strlen(dest) + 1));
- usrc = (unsigned char[]){
- 0xFF, 0x00, 0xFF, 0x00
- };
target = "FF:00:FF:00";
dest = apr_pencode_base16_binary(pool, usrc, 4, APR_ENCODE_COLON, &len);
ABTS_STR_EQUAL(tc, target, dest);
@@ -1075,16 +875,15 @@ static void test_decode_base16_binary(ab
{
apr_pool_t *pool;
const char *src;
- const unsigned char *utarget;
+ const unsigned char utarget[] = {
+ 0xFF, 0x00, 0xFF, 0x00
+ };
const unsigned char *udest;
apr_size_t len, vlen;
apr_pool_create(&pool, NULL);
src = "ff:00:ff:00";
- utarget = (unsigned char[]){
- 0xFF, 0x00, 0xFF, 0x00
- };
udest = apr_pdecode_base16_binary(pool, src, APR_ENCODE_STRING, APR_ENCODE_COLON, &vlen);
ABTS_ASSERT(tc, "apr_pdecode_base16_binary target!=dest", memcmp(utarget, udest, 4) == 0);
ABTS_INT_EQUAL(tc, (int)vlen, 4);