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 2021/09/10 00:22:17 UTC
svn commit: r1893203 - in /apr/apr/trunk: crypto/apr_crypto_openssl.c
include/apr_crypto.h test/testcrypto.c
Author: ylavic
Date: Fri Sep 10 00:22:17 2021
New Revision: 1893203
URL: http://svn.apache.org/viewvc?rev=1893203&view=rev
Log:
apr_crypto: s/APR_CRYPTO_CIPHER_CHACHA20_CTR/APR_CRYPTO_CIPHER_CHACHA20/g
Chacha is a stream cipher, not a block cipher in counter mode.
Modified:
apr/apr/trunk/crypto/apr_crypto_openssl.c
apr/apr/trunk/include/apr_crypto.h
apr/apr/trunk/test/testcrypto.c
Modified: apr/apr/trunk/crypto/apr_crypto_openssl.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_crypto_openssl.c?rev=1893203&r1=1893202&r2=1893203&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_crypto_openssl.c (original)
+++ apr/apr/trunk/crypto/apr_crypto_openssl.c Fri Sep 10 00:22:17 2021
@@ -1599,7 +1599,7 @@ static apr_status_t cprng_stream_ctx_mak
return APR_ENOCIPHER;
#endif
}
- case APR_CRYPTO_CIPHER_CHACHA20_CTR: {
+ case APR_CRYPTO_CIPHER_CHACHA20: {
#if defined(NID_chacha20)
ecipher = EVP_chacha20();
break;
Modified: apr/apr/trunk/include/apr_crypto.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_crypto.h?rev=1893203&r1=1893202&r2=1893203&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_crypto.h (original)
+++ apr/apr/trunk/include/apr_crypto.h Fri Sep 10 00:22:17 2021
@@ -165,7 +165,7 @@ typedef enum
{
APR_CRYPTO_CIPHER_AUTO, /** Choose the recommended cipher / autodetect the cipher */
APR_CRYPTO_CIPHER_AES_256_CTR, /** AES 256 - CTR mode */
- APR_CRYPTO_CIPHER_CHACHA20_CTR, /** ChaCha20 - CTR mode */
+ APR_CRYPTO_CIPHER_CHACHA20, /** ChaCha20 */
} apr_crypto_cipher_e;
/**
Modified: apr/apr/trunk/test/testcrypto.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testcrypto.c?rev=1893203&r1=1893202&r2=1893203&view=diff
==============================================================================
--- apr/apr/trunk/test/testcrypto.c (original)
+++ apr/apr/trunk/test/testcrypto.c Fri Sep 10 00:22:17 2021
@@ -2509,7 +2509,7 @@ static void test_crypto_prng_aes256(abts
static void test_crypto_prng_chacha20(abts_case *tc, void *data)
{
- return test_crypto_prng(tc, APR_CRYPTO_CIPHER_CHACHA20_CTR, test_PRNG_kat0_chacha20);
+ return test_crypto_prng(tc, APR_CRYPTO_CIPHER_CHACHA20, test_PRNG_kat0_chacha20);
}
#if APR_HAS_FORK