Skip to content

Commit f05a3bc

Browse files
minfrinminfrin
committed
testcrypto: Modern NSS has disabled various algorithms, remove them
from the tests. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1924464 13f79535-47bb-0310-9956-ffa450edef68
1 parent fefeef1 commit f05a3bc

File tree

1 file changed

+34
-34
lines changed

1 file changed

+34
-34
lines changed

‎test/testcrypto.c

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1293,16 +1293,16 @@ static void test_crypto_block_nss(abts_case *tc, void *data)
12931293
/* crypto_block_cross(tc, pool, drivers, KEY_3DES_192, MODE_ECB, 0, in, inlen, "KEY_3DES_192/MODE_ECB"); */
12941294
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_CBC, 0, in,
12951295
inlen, 32, "KEY_AES_256/MODE_CBC");
1296-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_ECB, 0, in,
1297-
inlen, 32, "KEY_AES_256/MODE_ECB");
1296+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_ECB, 0, in,
1297+
inlen, 32, "KEY_AES_256/MODE_ECB"); */
12981298
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_CBC, 0, in,
12991299
inlen, 24, "KEY_AES_192/MODE_CBC");
1300-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_ECB, 0, in,
1301-
inlen, 24, "KEY_AES_192/MODE_ECB");
1300+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_ECB, 0, in,
1301+
inlen, 24, "KEY_AES_192/MODE_ECB"); */
13021302
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_CBC, 0, in,
13031303
inlen, 16, "KEY_AES_128/MODE_CBC");
1304-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_ECB, 0, in,
1305-
inlen, 16, "KEY_AES_128/MODE_ECB");
1304+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_ECB, 0, in,
1305+
inlen, 16, "KEY_AES_128/MODE_ECB"); */
13061306
apr_pool_destroy(pool);
13071307

13081308
}
@@ -1479,16 +1479,16 @@ static void test_crypto_block_nss_openssl(abts_case *tc, void *data)
14791479
/* crypto_block_cross(tc, pool, drivers, KEY_3DES_192, MODE_ECB, 0, in, inlen, 24, "KEY_3DES_192/MODE_ECB"); */
14801480
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_CBC, 0, in,
14811481
inlen, 32, "KEY_AES_256/MODE_CBC");
1482-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_ECB, 0, in,
1483-
inlen, 32, "KEY_AES_256/MODE_ECB");
1482+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_ECB, 0, in,
1483+
inlen, 32, "KEY_AES_256/MODE_ECB"); */
14841484
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_CBC, 0, in,
14851485
inlen, 24, "KEY_AES_192/MODE_CBC");
1486-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_ECB, 0, in,
1487-
inlen, 24, "KEY_AES_192/MODE_ECB");
1486+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_ECB, 0, in,
1487+
inlen, 24, "KEY_AES_192/MODE_ECB"); */
14881488
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_CBC, 0, in,
14891489
inlen, 16, "KEY_AES_128/MODE_CBC");
1490-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_ECB, 0, in,
1491-
inlen, 16, "KEY_AES_128/MODE_ECB");
1490+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_ECB, 0, in,
1491+
inlen, 16, "KEY_AES_128/MODE_ECB"); */
14921492
apr_pool_destroy(pool);
14931493

14941494
}
@@ -1507,24 +1507,24 @@ static void test_crypto_block_openssl_nss(abts_case *tc, void *data)
15071507
apr_pool_create(&pool, NULL);
15081508
drivers[0] = get_openssl_driver(tc, pool);
15091509
drivers[1] = get_nss_driver(tc, pool);
1510-
crypto_block_cross(tc, pool, drivers, APR_KEY_3DES_192, APR_MODE_CBC, 0,
1511-
in, inlen, 24, "KEY_3DES_192/MODE_CBC");
1510+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_3DES_192, APR_MODE_CBC, 0,
1511+
in, inlen, 24, "KEY_3DES_192/MODE_CBC"); */
15121512

15131513
/* KEY_3DES_192 / MODE_ECB doesn't work on NSS */
15141514
/* crypto_block_cross(tc, pool, drivers, KEY_3DES_192, MODE_ECB, 0, in, inlen, 24, "KEY_3DES_192/MODE_ECB"); */
15151515

1516-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_CBC, 0, in,
1517-
inlen, 32, "KEY_AES_256/MODE_CBC");
1518-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_ECB, 0, in,
1519-
inlen, 32, "KEY_AES_256/MODE_ECB");
1520-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_CBC, 0, in,
1521-
inlen, 24, "KEY_AES_192/MODE_CBC");
1522-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_ECB, 0, in,
1523-
inlen, 24, "KEY_AES_192/MODE_ECB");
1524-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_CBC, 0, in,
1525-
inlen, 16, "KEY_AES_128/MODE_CBC");
1526-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_ECB, 0, in,
1527-
inlen, 16, "KEY_AES_128/MODE_ECB");
1516+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_CBC, 0, in,
1517+
inlen, 32, "KEY_AES_256/MODE_CBC"); */
1518+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_ECB, 0, in,
1519+
inlen, 32, "KEY_AES_256/MODE_ECB"); */
1520+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_CBC, 0, in,
1521+
inlen, 24, "KEY_AES_192/MODE_CBC"); */
1522+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_ECB, 0, in,
1523+
inlen, 24, "KEY_AES_192/MODE_ECB"); */
1524+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_CBC, 0, in,
1525+
inlen, 16, "KEY_AES_128/MODE_CBC"); */
1526+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_ECB, 0, in,
1527+
inlen, 16, "KEY_AES_128/MODE_ECB"); */
15281528
apr_pool_destroy(pool);
15291529

15301530
}
@@ -2013,27 +2013,27 @@ static void test_crypto_block_openssl_nss_pad(abts_case *tc, void *data)
20132013
apr_pool_create(&pool, NULL);
20142014
drivers[0] = get_openssl_driver(tc, pool);
20152015
drivers[1] = get_nss_driver(tc, pool);
2016-
crypto_block_cross(tc, pool, drivers, APR_KEY_3DES_192, APR_MODE_CBC, 1,
2017-
in, inlen, 24, "KEY_3DES_192/MODE_CBC");
2016+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_3DES_192, APR_MODE_CBC, 1,
2017+
in, inlen, 24, "KEY_3DES_192/MODE_CBC"); */
20182018

20192019
/* KEY_3DES_192 / MODE_ECB doesn't work on NSS */
20202020
/* crypto_block_cross(tc, pool, drivers, KEY_3DES_192, MODE_ECB, 1, in, inlen, 24, "KEY_3DES_192/MODE_ECB"); */
20212021

2022-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_CBC, 1, in,
2023-
inlen, 32, "KEY_AES_256/MODE_CBC");
2022+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_CBC, 1, in,
2023+
inlen, 32, "KEY_AES_256/MODE_CBC"); */
20242024

20252025
/* KEY_AES_256 / MODE_ECB doesn't support padding on NSS */
20262026
/*crypto_block_cross(tc, pool, drivers, KEY_AES_256, MODE_ECB, 1, in, inlen, 32, "KEY_AES_256/MODE_ECB");*/
20272027

2028-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_CBC, 1, in, inlen,
2029-
24, "KEY_AES_192/MODE_CBC");
2028+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_CBC, 1, in, inlen,
2029+
24, "KEY_AES_192/MODE_CBC"); */
20302030

20312031
/* KEY_AES_192 / MODE_ECB doesn't support padding on NSS */
20322032
/*crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_ECB, 1, in, inlen,
20332033
24, "KEY_AES_192/MODE_ECB");*/
20342034

2035-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_CBC, 1, in, inlen,
2036-
16, "KEY_AES_128/MODE_CBC");
2035+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_CBC, 1, in, inlen,
2036+
16, "KEY_AES_128/MODE_CBC"); */
20372037

20382038
/* KEY_AES_128 / MODE_ECB doesn't support padding on NSS */
20392039
/*crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_ECB, 1, in, inlen,

0 commit comments

Comments
 (0)