Skip to content

Commit 104fbb5

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-util/branches/1.7.x@1924465 13f79535-47bb-0310-9956-ffa450edef68
1 parent cf26d0b commit 104fbb5

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
@@ -1279,16 +1279,16 @@ static void test_crypto_block_nss(abts_case *tc, void *data)
12791279
/* crypto_block_cross(tc, pool, drivers, KEY_3DES_192, MODE_ECB, 0, in, inlen, "KEY_3DES_192/MODE_ECB"); */
12801280
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_CBC, 0, in,
12811281
inlen, 32, "KEY_AES_256/MODE_CBC");
1282-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_ECB, 0, in,
1283-
inlen, 32, "KEY_AES_256/MODE_ECB");
1282+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_ECB, 0, in,
1283+
inlen, 32, "KEY_AES_256/MODE_ECB"); */
12841284
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_CBC, 0, in,
12851285
inlen, 24, "KEY_AES_192/MODE_CBC");
1286-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_ECB, 0, in,
1287-
inlen, 24, "KEY_AES_192/MODE_ECB");
1286+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_ECB, 0, in,
1287+
inlen, 24, "KEY_AES_192/MODE_ECB"); */
12881288
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_CBC, 0, in,
12891289
inlen, 16, "KEY_AES_128/MODE_CBC");
1290-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_ECB, 0, in,
1291-
inlen, 16, "KEY_AES_128/MODE_ECB");
1290+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_ECB, 0, in,
1291+
inlen, 16, "KEY_AES_128/MODE_ECB"); */
12921292
apr_pool_destroy(pool);
12931293

12941294
}
@@ -1460,16 +1460,16 @@ static void test_crypto_block_nss_openssl(abts_case *tc, void *data)
14601460
/* crypto_block_cross(tc, pool, drivers, KEY_3DES_192, MODE_ECB, 0, in, inlen, 24, "KEY_3DES_192/MODE_ECB"); */
14611461
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_CBC, 0, in,
14621462
inlen, 32, "KEY_AES_256/MODE_CBC");
1463-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_ECB, 0, in,
1464-
inlen, 32, "KEY_AES_256/MODE_ECB");
1463+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_ECB, 0, in,
1464+
inlen, 32, "KEY_AES_256/MODE_ECB"); */
14651465
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_CBC, 0, in,
14661466
inlen, 24, "KEY_AES_192/MODE_CBC");
1467-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_ECB, 0, in,
1468-
inlen, 24, "KEY_AES_192/MODE_ECB");
1467+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_ECB, 0, in,
1468+
inlen, 24, "KEY_AES_192/MODE_ECB"); */
14691469
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_CBC, 0, in,
14701470
inlen, 16, "KEY_AES_128/MODE_CBC");
1471-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_ECB, 0, in,
1472-
inlen, 16, "KEY_AES_128/MODE_ECB");
1471+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_ECB, 0, in,
1472+
inlen, 16, "KEY_AES_128/MODE_ECB"); */
14731473
apr_pool_destroy(pool);
14741474

14751475
}
@@ -1488,24 +1488,24 @@ static void test_crypto_block_openssl_nss(abts_case *tc, void *data)
14881488
apr_pool_create(&pool, NULL);
14891489
drivers[0] = get_openssl_driver(tc, pool);
14901490
drivers[1] = get_nss_driver(tc, pool);
1491-
crypto_block_cross(tc, pool, drivers, APR_KEY_3DES_192, APR_MODE_CBC, 0,
1492-
in, inlen, 24, "KEY_3DES_192/MODE_CBC");
1491+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_3DES_192, APR_MODE_CBC, 0,
1492+
in, inlen, 24, "KEY_3DES_192/MODE_CBC"); */
14931493

14941494
/* KEY_3DES_192 / MODE_ECB doesn't work on NSS */
14951495
/* crypto_block_cross(tc, pool, drivers, KEY_3DES_192, MODE_ECB, 0, in, inlen, 24, "KEY_3DES_192/MODE_ECB"); */
14961496

1497-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_CBC, 0, in,
1498-
inlen, 32, "KEY_AES_256/MODE_CBC");
1499-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_ECB, 0, in,
1500-
inlen, 32, "KEY_AES_256/MODE_ECB");
1501-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_CBC, 0, in,
1502-
inlen, 24, "KEY_AES_192/MODE_CBC");
1503-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_ECB, 0, in,
1504-
inlen, 24, "KEY_AES_192/MODE_ECB");
1505-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_CBC, 0, in,
1506-
inlen, 16, "KEY_AES_128/MODE_CBC");
1507-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_ECB, 0, in,
1508-
inlen, 16, "KEY_AES_128/MODE_ECB");
1497+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_CBC, 0, in,
1498+
inlen, 32, "KEY_AES_256/MODE_CBC"); */
1499+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_ECB, 0, in,
1500+
inlen, 32, "KEY_AES_256/MODE_ECB"); */
1501+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_CBC, 0, in,
1502+
inlen, 24, "KEY_AES_192/MODE_CBC"); */
1503+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_ECB, 0, in,
1504+
inlen, 24, "KEY_AES_192/MODE_ECB"); */
1505+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_CBC, 0, in,
1506+
inlen, 16, "KEY_AES_128/MODE_CBC"); */
1507+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_ECB, 0, in,
1508+
inlen, 16, "KEY_AES_128/MODE_ECB"); */
15091509
apr_pool_destroy(pool);
15101510

15111511
}
@@ -1984,27 +1984,27 @@ static void test_crypto_block_openssl_nss_pad(abts_case *tc, void *data)
19841984
apr_pool_create(&pool, NULL);
19851985
drivers[0] = get_openssl_driver(tc, pool);
19861986
drivers[1] = get_nss_driver(tc, pool);
1987-
crypto_block_cross(tc, pool, drivers, APR_KEY_3DES_192, APR_MODE_CBC, 1,
1988-
in, inlen, 24, "KEY_3DES_192/MODE_CBC");
1987+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_3DES_192, APR_MODE_CBC, 1,
1988+
in, inlen, 24, "KEY_3DES_192/MODE_CBC"); */
19891989

19901990
/* KEY_3DES_192 / MODE_ECB doesn't work on NSS */
19911991
/* crypto_block_cross(tc, pool, drivers, KEY_3DES_192, MODE_ECB, 1, in, inlen, 24, "KEY_3DES_192/MODE_ECB"); */
19921992

1993-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_CBC, 1, in,
1994-
inlen, 32, "KEY_AES_256/MODE_CBC");
1993+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_256, APR_MODE_CBC, 1, in,
1994+
inlen, 32, "KEY_AES_256/MODE_CBC"); */
19951995

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

1999-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_CBC, 1, in, inlen,
2000-
24, "KEY_AES_192/MODE_CBC");
1999+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_CBC, 1, in, inlen,
2000+
24, "KEY_AES_192/MODE_CBC"); */
20012001

20022002
/* KEY_AES_192 / MODE_ECB doesn't support padding on NSS */
20032003
/*crypto_block_cross(tc, pool, drivers, APR_KEY_AES_192, APR_MODE_ECB, 1, in, inlen,
20042004
24, "KEY_AES_192/MODE_ECB");*/
20052005

2006-
crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_CBC, 1, in, inlen,
2007-
16, "KEY_AES_128/MODE_CBC");
2006+
/* crypto_block_cross(tc, pool, drivers, APR_KEY_AES_128, APR_MODE_CBC, 1, in, inlen,
2007+
16, "KEY_AES_128/MODE_CBC"); */
20082008

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

0 commit comments

Comments
 (0)