Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/aioquic/_crypto.c
Original file line number Diff line number Diff line change
Expand Up @@ -407,10 +407,13 @@ PyInit__crypto(void)
PyModule_AddObject(m, "HeaderProtection", HeaderProtectionType);

// ensure required ciphers are initialised
// LibreSSL loads all cipher by default, and doesn't support add_cipher
#ifndef LIBRESSL_VERSION_NUMBER
EVP_add_cipher(EVP_aes_128_ecb());
EVP_add_cipher(EVP_aes_128_gcm());
EVP_add_cipher(EVP_aes_256_ecb());
EVP_add_cipher(EVP_aes_256_gcm());
#endif

return m;
}
1 change: 1 addition & 0 deletions tests/test_asyncio.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ async def test_connect_and_serve_with_ed25519_certificate(self):
)
)

@skipIf("ed448" in SKIP_TESTS, "Skipping ed448 tests")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is this used?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I don't understand your question. Can I ask you to rephase it?

@asynctest
async def test_connect_and_serve_with_ed448_certificate(self):
await self._test_connect_and_serve_with_certificate(
Expand Down
4 changes: 3 additions & 1 deletion tests/test_tls.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import datetime
import ssl
from functools import partial
from unittest import TestCase
from unittest import TestCase, skipIf
from unittest.mock import patch

from aioquic import tls
Expand Down Expand Up @@ -49,6 +49,7 @@
SERVER_CACERTFILE,
SERVER_CERTFILE,
SERVER_KEYFILE,
SKIP_TESTS,
generate_ec_certificate,
generate_ed448_certificate,
generate_ed25519_certificate,
Expand Down Expand Up @@ -583,6 +584,7 @@ def test_handshake_with_ed25519_certificate(self):
*generate_ed25519_certificate(common_name="example.com")
)

@skipIf("ed448" in SKIP_TESTS, "Skipping ed448 tests")
def test_handshake_with_ed448_certificate(self):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not use the same skipIf("ed448" in SKIP_TESTS) as above?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed it make things cleaner

self._test_handshake_with_certificate(
*generate_ed448_certificate(common_name="example.com")
Expand Down