diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libssl/hidden/ssl_namespace.h | 6 | ||||
-rw-r--r-- | src/lib/libssl/shlib_version | 2 | ||||
-rw-r--r-- | src/lib/libssl/ssl_rsa.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/libssl/hidden/ssl_namespace.h b/src/lib/libssl/hidden/ssl_namespace.h index 5d26516f3c..763dcd700f 100644 --- a/src/lib/libssl/hidden/ssl_namespace.h +++ b/src/lib/libssl/hidden/ssl_namespace.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_namespace.h,v 1.3 2024/07/12 05:26:34 miod Exp $ */ | 1 | /* $OpenBSD: ssl_namespace.h,v 1.4 2025/08/18 16:00:53 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2016 Philip Guenther <guenther@openbsd.org> | 3 | * Copyright (c) 2016 Philip Guenther <guenther@openbsd.org> |
4 | * | 4 | * |
@@ -35,7 +35,11 @@ | |||
35 | #else | 35 | #else |
36 | #define LSSL_UNUSED(x) | 36 | #define LSSL_UNUSED(x) |
37 | #define LSSL_USED(x) | 37 | #define LSSL_USED(x) |
38 | #ifdef _MSC_VER | ||
39 | #define LSSL_ALIAS(x) | ||
40 | #else | ||
38 | #define LSSL_ALIAS(x) asm("") | 41 | #define LSSL_ALIAS(x) asm("") |
42 | #endif /* _MSC_VER */ | ||
39 | #endif | 43 | #endif |
40 | 44 | ||
41 | #endif /* _LIBSSL_SSL_NAMESPACE_H_ */ | 45 | #endif /* _LIBSSL_SSL_NAMESPACE_H_ */ |
diff --git a/src/lib/libssl/shlib_version b/src/lib/libssl/shlib_version index 97e30d617d..144eba9237 100644 --- a/src/lib/libssl/shlib_version +++ b/src/lib/libssl/shlib_version | |||
@@ -1,3 +1,3 @@ | |||
1 | # Don't forget to give libtls the same type of bump! | 1 | # Don't forget to give libtls the same type of bump! |
2 | major=60 | 2 | major=60 |
3 | minor=0 | 3 | minor=1 |
diff --git a/src/lib/libssl/ssl_rsa.c b/src/lib/libssl/ssl_rsa.c index 6c8a2be3d3..1490e10ba4 100644 --- a/src/lib/libssl/ssl_rsa.c +++ b/src/lib/libssl/ssl_rsa.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_rsa.c,v 1.51 2023/12/30 06:25:56 tb Exp $ */ | 1 | /* $OpenBSD: ssl_rsa.c,v 1.53 2025/08/14 15:55:54 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 | * |