Skip to content

Basic TLS Encrypted ClientHello (ECH) support (updated) #1340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Basic TLS Encrypted ClientHello (ECH) support (updated) #1340

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c9968c0
wire up ECH functions from boringssl
eighthave Sep 17, 2021
3ae5bd7
implement ECH Retry Config handling
eighthave Nov 10, 2021
e39aca1
use Android DnsPacket to implement DNS using JNDI/DnsResolver
eighthave Oct 21, 2021
dcbddbb
hack in Exception to handle "ECH_REJECTED" and Retry Configs
eighthave Nov 17, 2021
b1a6773
gradlew: add distributionSha256Sum to verify download
eighthave May 11, 2021
50f54ed
Convenient debug print for ECH Config Lists
eighthave Nov 10, 2021
cb3fb9c
EchInteropTest
eighthave Nov 10, 2021
7ed0dd3
add .gitlab-ci.yml
eighthave Oct 15, 2019
37198ff
additional tests that trigger AssertionError with checkErrorQueue
eighthave Nov 12, 2021
c3a1454
WIP implement full server ECH API
eighthave Nov 10, 2021
0f2c303
changes to resolve compile issues
mnbogner May 12, 2025
e4bf0ab
Merge branch 'master' of https://github.com/google/conscrypt into mas…
mnbogner May 12, 2025
679e4ec
Merge branch 'master' of https://github.com/eighthave/conscrypt into …
mnbogner May 13, 2025
e9de453
fixing several compile errors
mnbogner May 14, 2025
3235c53
restore missing test code
mnbogner May 15, 2025
4cb4ebd
revised test cases to handle exceptions better and print louder log m…
mnbogner May 23, 2025
5bb8514
revert changes required for local build issues
mnbogner May 26, 2025
a7de26c
revised tests to use live dns results instead of parsed files
mnbogner May 31, 2025
1481f4b
replace parameters with parameter object
mnbogner Jun 3, 2025
23ba5bb
fleshed out Conscrypt method descriptions based on feedback
mnbogner Jun 11, 2025
d24922d
Merge branch 'master' of https://github.com/google/conscrypt into bas…
mnbogner Jun 11, 2025
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
Prev Previous commit
Next Next commit
fixing several compile errors
  • Loading branch information
@mnbogner
mnbogner committed May 14, 2025
commit e9de45351e9844309bb94e813b407a958fb8c78d
7 changes: 4 additions & 3 deletions common/src/jni/main/cpp/conscrypt/native_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11621,7 +11621,8 @@ static jboolean NativeCrypto_SSL_set1_ech_config_list(JNIEnv* env, jclass, jlong
" could not read config bytes");
return JNI_FALSE;
}
const uint8_t* bs = reinterpret_cast<const uint8_t*>(configBytes.get());
// UNUSED?
// const uint8_t* bs = reinterpret_cast<const uint8_t*>(configBytes.get());
int ret = SSL_set1_ech_config_list(ssl, reinterpret_cast<const uint8_t*>(configBytes.get()),
configBytes.size());
JNI_TRACE("ssl=%p NativeCrypto_SSL_set1_ech_config_list(%p) => %d", ssl, configJavaBytes, ret);
Expand Down Expand Up @@ -11690,7 +11691,7 @@ static jbyteArray NativeCrypto_SSL_marshal_ech_config(JNIEnv* env, jclass, short
const uint8_t* key = reinterpret_cast<const uint8_t*>(keyBytes.get());
size_t keySize = keyBytes.size();
bssl::UniquePtr<SSL_ECH_KEYS> keys(SSL_ECH_KEYS_new());
SSL_ECH_KEYS_add(keys.get(), /*is_retry_config=*1, ech_config, ech_config_len, key.get());
SSL_ECH_KEYS_add(keys.get(), [SLASH,ASTERIX]is_retry_config=*1, ech_config, ech_config_len, key.get());
bssl::ScopedEVP_HPKE_KEY hpke_key;
JNI_TRACE("NativeCrypto_SSL_marshal_ech_config(keyJavaBytes=%p) =>", keyJavaBytes);
*/
Expand Down Expand Up @@ -11759,7 +11760,7 @@ static jbyteArray NativeCrypto_SSL_ECH_KEYS_marshal_retry_configs(JNIEnv* env, j
}
if (!keys ||
!EVP_HPKE_KEY_init(hpke_key.get(), EVP_hpke_x25519_hkdf_sha256(), key, keySize) ||
!SSL_ECH_KEYS_add(keys.get(), /*is_retry_config=*1, config, configSize, hpke_key.get()) ||
!SSL_ECH_KEYS_add(keys.get(), [SLASH,ASTERIX]is_retry_config=*1, config, configSize, hpke_key.get()) ||
JNI_TRACE("NativeCrypto_SSL_ECH_KEYS_marshal_retry_configs: Error setting private key\n");
return nullptr;
}
Expand Down