Skip to content

Commit e5a21b6

Browse files
andywolkandywolk
authored
Merge pull request #5 from freeswitch/3.4.3
Upgrade OpenSSL to version 3.4.3
2 parents a7c7444 + 0620cbe commit e5a21b6

7 files changed

Lines changed: 22 additions & 26 deletions

File tree

‎include/openssl/cmserr.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Generated by util/mkerr.pl DO NOT EDIT
3-
* Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
3+
* Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
44
*
55
* Licensed under the Apache License 2.0 (the "License"). You may not use
66
* this file except in compliance with the License. You can obtain a copy
@@ -49,6 +49,7 @@
4949
# define CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE 114
5050
# define CMS_R_ERROR_SETTING_KEY 115
5151
# define CMS_R_ERROR_SETTING_RECIPIENTINFO 116
52+
# define CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT 196
5253
# define CMS_R_ESS_SIGNING_CERTID_MISMATCH_ERROR 183
5354
# define CMS_R_INVALID_ENCRYPTED_KEY_LENGTH 117
5455
# define CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER 176

‎include/openssl/crypto.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by makefile from include\openssl\crypto.h.in
44
*
5-
* Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
66
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
77
*
88
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -358,9 +358,9 @@ OSSL_CRYPTO_ALLOC void *CRYPTO_zalloc(size_t num, const char *file, int line);
358358
OSSL_CRYPTO_ALLOC void *CRYPTO_aligned_alloc(size_t num, size_t align,
359359
void **freeptr, const char *file,
360360
int line);
361-
OSSL_CRYPTO_ALLOC void *CRYPTO_memdup(const void *str, size_t siz, const char *file, int line);
362-
OSSL_CRYPTO_ALLOC char *CRYPTO_strdup(const char *str, const char *file, int line);
363-
OSSL_CRYPTO_ALLOC char *CRYPTO_strndup(const char *str, size_t s, const char *file, int line);
361+
void *CRYPTO_memdup(const void *str, size_t siz, const char *file, int line);
362+
char *CRYPTO_strdup(const char *str, const char *file, int line);
363+
char *CRYPTO_strndup(const char *str, size_t s, const char *file, int line);
364364
void CRYPTO_free(void *ptr, const char *file, int line);
365365
void CRYPTO_clear_free(void *ptr, size_t num, const char *file, int line);
366366
void *CRYPTO_realloc(void *addr, size_t num, const char *file, int line);

‎include/openssl/opensslv.h‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by makefile from include\openssl\opensslv.h.in
44
*
5-
* Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 1999-2025 The OpenSSL Project Authors. All Rights Reserved.
66
*
77
* Licensed under the Apache License 2.0 (the "License"). You may not use
88
* this file except in compliance with the License. You can obtain a copy
@@ -29,7 +29,7 @@ extern "C" {
2929
*/
3030
# define OPENSSL_VERSION_MAJOR 3
3131
# define OPENSSL_VERSION_MINOR 4
32-
# define OPENSSL_VERSION_PATCH 0
32+
# define OPENSSL_VERSION_PATCH 3
3333

3434
/*
3535
* Additional version information
@@ -74,33 +74,28 @@ extern "C" {
7474
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
7575
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
7676
*/
77-
# define OPENSSL_VERSION_STR "3.4.0"
78-
# define OPENSSL_FULL_VERSION_STR "3.4.0"
77+
# define OPENSSL_VERSION_STR "3.4.3"
78+
# define OPENSSL_FULL_VERSION_STR "3.4.3"
7979

8080
/*
8181
* SECTION 3: ADDITIONAL METADATA
8282
*
8383
* These strings are defined separately to allow them to be parsable.
8484
*/
85-
# define OPENSSL_RELEASE_DATE "22 Oct 2024"
85+
# define OPENSSL_RELEASE_DATE "30 Sep 2025"
8686

8787
/*
8888
* SECTION 4: BACKWARD COMPATIBILITY
8989
*/
9090

91-
# define OPENSSL_VERSION_TEXT "OpenSSL 3.4.0 22 Oct 2024"
91+
# define OPENSSL_VERSION_TEXT "OpenSSL 3.4.3 30 Sep 2025"
9292

93-
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
94-
# ifdef OPENSSL_VERSION_PRE_RELEASE
95-
# define _OPENSSL_VERSION_PRE_RELEASE 0x0L
96-
# else
97-
# define _OPENSSL_VERSION_PRE_RELEASE 0xfL
98-
# endif
93+
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PP0L */
9994
# define OPENSSL_VERSION_NUMBER \
10095
( (OPENSSL_VERSION_MAJOR<<28) \
10196
|(OPENSSL_VERSION_MINOR<<20) \
10297
|(OPENSSL_VERSION_PATCH<<4) \
103-
|_OPENSSL_VERSION_PRE_RELEASE )
98+
|0x0L )
10499

105100
# ifdef __cplusplus
106101
}

‎include/openssl/pem.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
2+
* Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
33
*
44
* Licensed under the Apache License 2.0 (the "License"). You may not use
55
* this file except in compliance with the License. You can obtain a copy
@@ -57,6 +57,7 @@ extern "C" {
5757
# define PEM_STRING_ECPRIVATEKEY "EC PRIVATE KEY"
5858
# define PEM_STRING_PARAMETERS "PARAMETERS"
5959
# define PEM_STRING_CMS "CMS"
60+
# define PEM_STRING_SM2PRIVATEKEY "SM2 PRIVATE KEY"
6061
# define PEM_STRING_SM2PARAMETERS "SM2 PARAMETERS"
6162
# define PEM_STRING_ACERT "ATTRIBUTE CERTIFICATE"
6263

‎include/openssl/ssl.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by makefile from include\openssl\ssl.h.in
44
*
5-
* Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
66
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
77
* Copyright 2005 Nokia. All rights reserved.
88
*
@@ -1868,8 +1868,8 @@ __owur int SSL_set_purpose(SSL *ssl, int purpose);
18681868
__owur int SSL_CTX_set_trust(SSL_CTX *ctx, int trust);
18691869
__owur int SSL_set_trust(SSL *ssl, int trust);
18701870

1871-
__owur int SSL_set1_host(SSL *s, const char *hostname);
1872-
__owur int SSL_add1_host(SSL *s, const char *hostname);
1871+
__owur int SSL_set1_host(SSL *s, const char *host);
1872+
__owur int SSL_add1_host(SSL *s, const char *host);
18731873
__owur const char *SSL_get0_peername(SSL *s);
18741874
void SSL_set_hostflags(SSL *s, unsigned int flags);
18751875

‎include/openssl/x509.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,9 +1098,8 @@ X509_EXTENSION *X509v3_get_ext(const STACK_OF(X509_EXTENSION) *x, int loc);
10981098
X509_EXTENSION *X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int loc);
10991099
STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
11001100
X509_EXTENSION *ex, int loc);
1101-
STACK_OF(X509_EXTENSION)
1102-
*X509v3_add_extensions(STACK_OF(X509_EXTENSION) **target,
1103-
const STACK_OF(X509_EXTENSION) *exts);
1101+
STACK_OF(X509_EXTENSION) *X509v3_add_extensions(STACK_OF(X509_EXTENSION) **target,
1102+
const STACK_OF(X509_EXTENSION) *exts);
11041103

11051104
int X509_get_ext_count(const X509 *x);
11061105
int X509_get_ext_by_NID(const X509 *x, int nid, int lastpos);

‎openssl-version.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
55
</ImportGroup>
66
<PropertyGroup Label="UserMacros">
7-
<opensslVersion>3.4.0</opensslVersion>
7+
<opensslVersion>3.4.3</opensslVersion>
88
<opensslLibDir>$(BaseDir)openssl-$(opensslVersion)</opensslLibDir>
99
</PropertyGroup>
1010
<PropertyGroup>

0 commit comments

Comments
 (0)