Skip to content
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

fix for #557. merged several CryptoLib/OpenSSL fixes #564

Merged
merged 5 commits into from
Apr 20, 2021
Merged

fix for #557. merged several CryptoLib/OpenSSL fixes #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0f0cc5b
* fixed: mutex is allocated before tryingto get file descriptor. as i…
dkimitsa Mar 14, 2021
149d6da
* applied alpn protocol related fix from https://android-review.googl…
dkimitsa Mar 14, 2021
4ce0a23
* applied missing part of CVE-2010-3864 (https://www.openssl.org/news…
dkimitsa Mar 15, 2021
3c6e253
* applied 68360-Tidy up locking in OpenSSLSocketImpl that improves mu…
dkimitsa Mar 15, 2021
1848d4d
Merge branch 'master' into crypto/fixes
Tom-Ski Apr 19, 2021
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
4 changes: 2 additions & 2 deletions compiler/rt/libcore/crypto/src/main/java/org/conscrypt/NativeCrypto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,9 +1015,9 @@ public static native void SSL_set_tlsext_host_name(long sslNativePointer, String

/**
* For clients, sets the list of supported ALPN protocols in wire-format
* (length-prefixed 8-bit strings) on an SSL context.
* (length-prefixed 8-bit strings).
*/
public static native int SSL_CTX_set_alpn_protos(long sslCtxPointer, byte[] protos);
public static native int SSL_set_alpn_protos(long sslPointer, byte[] protos);

/**
* Returns the selected ALPN protocol. If the server did not select a
Expand Down
Loading