From: Sashan <anedvedicky@gmail.com>
Date: Wed, 1 Apr 2026 06:28:31 +0000 (+0200)
Subject: Update apps/lib/s_cb.c
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bed493cb496bcf22a54ce8f5af27cd0c489b03de;p=thirdparty%2Fopenssl.git

Update apps/lib/s_cb.c

Co-authored-by: Bob Beck <beck@obtuse.com>

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr 10 12:22:46 2026
(Merged from https://github.com/openssl/openssl/pull/30596)
---

diff --git a/apps/lib/s_cb.c b/apps/lib/s_cb.c
index 87f7241547e..5629e138f87 100644
--- a/apps/lib/s_cb.c
+++ b/apps/lib/s_cb.c
@@ -414,7 +414,7 @@ int ssl_print_tmp_key(BIO *out, SSL *s)
             const char *name = SSL_group_to_name(s, nid);
 
             if (name == NULL)
-                BIO_printf(out, "Negotiated TLS1.3 group: %d\n", nid);
+                BIO_printf(out, "Negotiated TLS1.3 group NID: %d\n", nid);
             else
                 BIO_printf(out, "Negotiated TLS1.3 group: %s\n", name);
         }
diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index 22b6513e176..76af9a460b4 100644
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -64,7 +64,7 @@ BIO *BIO_new_file(const char *filename, const char *mode)
         fp_flags |= BIO_FP_TEXT;
 
     if (filename == NULL) {
-        ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER, __func__);
+        ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER);
         return NULL;
     }
 
@@ -317,7 +317,7 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
             OPENSSL_strlcat(p, "b", sizeof(p));
 #endif
         if (ptr == NULL) {
-            ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER, __func__);
+            ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER);
             ret = 0;
             break;
         }