diff options
Diffstat (limited to 'src/lib/libssl')
-rw-r--r-- | src/lib/libssl/d1_both.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/ssl_local.h | 6 | ||||
-rw-r--r-- | src/lib/libssl/tls13_internal.h | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libssl/d1_both.c b/src/lib/libssl/d1_both.c index b5c68a1735..e144d8f533 100644 --- a/src/lib/libssl/d1_both.c +++ b/src/lib/libssl/d1_both.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: d1_both.c,v 1.84 2022/12/26 07:31:44 jmc Exp $ */ | 1 | /* $OpenBSD: d1_both.c,v 1.85 2025/03/09 15:12:18 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
@@ -868,7 +868,7 @@ dtls1_read_failed(SSL *s, int code) | |||
868 | if (code > 0) { | 868 | if (code > 0) { |
869 | #ifdef DEBUG | 869 | #ifdef DEBUG |
870 | fprintf(stderr, "invalid state reached %s:%d", | 870 | fprintf(stderr, "invalid state reached %s:%d", |
871 | __FILE__, __LINE__); | 871 | OPENSSL_FILE, OPENSSL_LINE); |
872 | #endif | 872 | #endif |
873 | return 1; | 873 | return 1; |
874 | } | 874 | } |
diff --git a/src/lib/libssl/ssl_local.h b/src/lib/libssl/ssl_local.h index 06baedfd22..6095940388 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.26 2025/01/18 12:20:37 tb Exp $ */ | 1 | /* $OpenBSD: ssl_local.h,v 1.27 2025/03/09 15:12:18 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 | * |
@@ -1443,8 +1443,8 @@ int ssl3_cbc_digest_record(const EVP_MD_CTX *ctx, unsigned char *md_out, | |||
1443 | unsigned int mac_secret_length); | 1443 | unsigned int mac_secret_length); |
1444 | int SSL_state_func_code(int _state); | 1444 | int SSL_state_func_code(int _state); |
1445 | 1445 | ||
1446 | #define SSLerror(s, r) SSL_error_internal(s, r, __FILE__, __LINE__) | 1446 | #define SSLerror(s, r) SSL_error_internal(s, r, OPENSSL_FILE, OPENSSL_LINE) |
1447 | #define SSLerrorx(r) ERR_PUT_error(ERR_LIB_SSL,(0xfff),(r),__FILE__,__LINE__) | 1447 | #define SSLerrorx(r) ERR_PUT_error(ERR_LIB_SSL,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE) |
1448 | void SSL_error_internal(const SSL *s, int r, char *f, int l); | 1448 | void SSL_error_internal(const SSL *s, int r, char *f, int l); |
1449 | 1449 | ||
1450 | #ifndef OPENSSL_NO_SRTP | 1450 | #ifndef OPENSSL_NO_SRTP |
diff --git a/src/lib/libssl/tls13_internal.h b/src/lib/libssl/tls13_internal.h index 0819e93338..7a7f8abc63 100644 --- a/src/lib/libssl/tls13_internal.h +++ b/src/lib/libssl/tls13_internal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls13_internal.h,v 1.104 2024/09/09 03:32:29 tb Exp $ */ | 1 | /* $OpenBSD: tls13_internal.h,v 1.105 2025/03/09 15:12:18 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2018 Bob Beck <beck@openbsd.org> |
4 | * Copyright (c) 2018 Theo Buehler <tb@openbsd.org> | 4 | * Copyright (c) 2018 Theo Buehler <tb@openbsd.org> |
@@ -425,10 +425,10 @@ int tls13_error_setx(struct tls13_error *error, int code, int subcode, | |||
425 | const char *file, int line, const char *fmt, ...); | 425 | const char *file, int line, const char *fmt, ...); |
426 | 426 | ||
427 | #define tls13_set_error(ctx, code, subcode, fmt, ...) \ | 427 | #define tls13_set_error(ctx, code, subcode, fmt, ...) \ |
428 | tls13_error_set(&(ctx)->error, (code), (subcode), __FILE__, __LINE__, \ | 428 | tls13_error_set(&(ctx)->error, (code), (subcode), OPENSSL_FILE, OPENSSL_LINE, \ |
429 | (fmt), __VA_ARGS__) | 429 | (fmt), __VA_ARGS__) |
430 | #define tls13_set_errorx(ctx, code, subcode, fmt, ...) \ | 430 | #define tls13_set_errorx(ctx, code, subcode, fmt, ...) \ |
431 | tls13_error_setx(&(ctx)->error, (code), (subcode), __FILE__, __LINE__, \ | 431 | tls13_error_setx(&(ctx)->error, (code), (subcode), OPENSSL_FILE, OPENSSL_LINE, \ |
432 | (fmt), __VA_ARGS__) | 432 | (fmt), __VA_ARGS__) |
433 | 433 | ||
434 | int tls13_exporter(struct tls13_ctx *ctx, const uint8_t *label, size_t label_len, | 434 | int tls13_exporter(struct tls13_ctx *ctx, const uint8_t *label, size_t label_len, |