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

Update BoringSSL's branch name to main #1301

Merged
merged 1 commit into from
Jan 23, 2025
Merged

Update BoringSSL's branch name to main #1301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ jobs:
name: boringssl-source
path: ${{ runner.temp }}/boringssl

- name: Checkout BoringSSL master branch
- name: Checkout BoringSSL main branch
shell: bash
run: |
cd "$BORINGSSL_HOME"
git checkout --progress --force -B master
git checkout --progress --force -B main

- name: Build BoringSSL x86 and ARM MacOS
if: runner.os == 'macOS'
Expand Down Expand Up @@ -248,11 +248,11 @@ jobs:
name: boringssl-source
path: ${{ runner.temp }}/boringssl

- name: Checkout BoringSSL master branch
- name: Checkout BoringSSL main branch
shell: bash
run: |
cd "$BORINGSSL_HOME"
git checkout --progress --force -B master
git checkout --progress --force -B main

- name: Build BoringSSL 64-bit Linux
run: |
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -2800,7 +2800,7 @@ static jlong evpDigestSignVerifyInit(JNIEnv* env,
JNI_TRACE("%s(%p, %p, %p) <- ptr", jniName, mdCtx, md, pkey);

// For ED25519, md must be null, see
// https://github.com/google/boringssl/blob/master/include/openssl/evp.h
// https://github.com/google/boringssl/blob/main/include/openssl/evp.h
if (md == nullptr && (EVP_PKEY_id(pkey) != EVP_PKEY_ED25519)) {
JNI_TRACE("ctx=%p %s => md == null", mdCtx, jniName);
conscrypt::jniutil::throwNullPointerException(env, "md == null");
Expand Down
2 changes: 1 addition & 1 deletion testing/src/main/java/org/conscrypt/java/security/StandardNames.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ private static void addOpenSsl(String cipherSuite) {
"TLS_PSK_WITH_AES_256_CBC_SHA");

// Should be updated to match BoringSSL's defaults when they change.
// https://boringssl.googlesource.com/boringssl/+/master/ssl/t1_lib.cc#289
// https://boringssl.googlesource.com/boringssl/+/main/ssl/extensions.cc#215
Copy link
Contributor Author

Choose a reason for hiding this comment

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

TBH this is just going to get out of date again later, but I will deal with that another time. :-)

private static final List<String> ELLIPTIC_CURVES_DEFAULT =
Arrays.asList("x25519 (29)", "secp256r1 (23)", "secp384r1 (24)");

Expand Down
Loading