summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2025-05-10 05:31:21 +0000
committertb <>2025-05-10 05:31:21 +0000
commit46419c358ff7f2bcc5f1d19d91545f01d70a448d (patch)
treebd15580fc65da8857424c9078b6c4bd747d33f47
parent7d5e6890156b686b6b3e771d9efd343ce8df5fa9 (diff)
downloadopenbsd-46419c358ff7f2bcc5f1d19d91545f01d70a448d.tar.gz
openbsd-46419c358ff7f2bcc5f1d19d91545f01d70a448d.tar.bz2
openbsd-46419c358ff7f2bcc5f1d19d91545f01d70a448d.zip
const correct SSL_error_internal()
-rw-r--r--src/lib/libssl/ssl_err.c4
-rw-r--r--src/lib/libssl/ssl_local.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_err.c b/src/lib/libssl/ssl_err.c
index eac2d9e61f..4214edbcc9 100644
--- a/src/lib/libssl/ssl_err.c
+++ b/src/lib/libssl/ssl_err.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_err.c,v 1.53 2024/10/09 08:00:29 tb Exp $ */ 1/* $OpenBSD: ssl_err.c,v 1.54 2025/05/10 05:31:21 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -669,7 +669,7 @@ SSL_state_func_code(int state) {
669} 669}
670 670
671void 671void
672SSL_error_internal(const SSL *s, int r, char *f, int l) 672SSL_error_internal(const SSL *s, int r, const char *f, int l)
673{ 673{
674 ERR_PUT_error(ERR_LIB_SSL, 674 ERR_PUT_error(ERR_LIB_SSL,
675 (SSL_state_func_code(s->s3->hs.state)), r, f, l); 675 (SSL_state_func_code(s->s3->hs.state)), r, f, l);
diff --git a/src/lib/libssl/ssl_local.h b/src/lib/libssl/ssl_local.h
index 3a377030b0..1f41312d9c 100644
--- a/src/lib/libssl/ssl_local.h
+++ b/src/lib/libssl/ssl_local.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_local.h,v 1.29 2025/04/18 08:07:36 tb Exp $ */ 1/* $OpenBSD: ssl_local.h,v 1.30 2025/05/10 05:31:21 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1439,9 +1439,9 @@ int ssl3_cbc_digest_record(const EVP_MD_CTX *ctx, unsigned char *md_out,
1439 unsigned int mac_secret_length); 1439 unsigned int mac_secret_length);
1440int SSL_state_func_code(int _state); 1440int SSL_state_func_code(int _state);
1441 1441
1442void SSL_error_internal(const SSL *s, int r, const char *f, int l);
1442#define SSLerror(s, r) SSL_error_internal(s, r, OPENSSL_FILE, OPENSSL_LINE) 1443#define SSLerror(s, r) SSL_error_internal(s, r, OPENSSL_FILE, OPENSSL_LINE)
1443#define SSLerrorx(r) ERR_PUT_error(ERR_LIB_SSL,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE) 1444#define SSLerrorx(r) ERR_PUT_error(ERR_LIB_SSL,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
1444void SSL_error_internal(const SSL *s, int r, char *f, int l);
1445 1445
1446#ifndef OPENSSL_NO_SRTP 1446#ifndef OPENSSL_NO_SRTP
1447 1447