Update BoringSSL's branch name to main

google · Jan 22, 2025 · cdd785c · cdd785c
1 parent 8565cc7
commit cdd785c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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'
@@ -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: |

diff --git a/common/src/jni/main/cpp/conscrypt/native_crypto.cc b/common/src/jni/main/cpp/conscrypt/native_crypto.cc
@@ -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");

diff --git a/testing/src/main/java/org/conscrypt/java/security/StandardNames.java b/testing/src/main/java/org/conscrypt/java/security/StandardNames.java
@@ -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
     private static final List<String> ELLIPTIC_CURVES_DEFAULT =
             Arrays.asList("x25519 (29)", "secp256r1 (23)", "secp384r1 (24)");