Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[openssl] Update to 3.2.0 #35734

Merged
merged 4 commits into from
Dec 20, 2023
Merged

[openssl] Update to 3.2.0 #35734

merged 4 commits into from
Dec 20, 2023

Conversation

dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Dec 16, 2023

Fixes #35723.
Based on #35298, CC @MehdiChinoune.
The FreeRDP patch is as a temporary solution until updating that port to 3.0.0, with no side effect for users which stay at openssl < 3.2.0.

Patches upstreamed: openssl/openssl#23072

@dg0yt dg0yt marked this pull request as ready for review December 17, 2023 13:55
@FrankXie05 FrankXie05 self-assigned this Dec 18, 2023
@FrankXie05 FrankXie05 added the category:port-update The issue is with a library, which is requesting update new revision label Dec 18, 2023
@FrankXie05 FrankXie05 added the info:reviewed Pull Request changes follow basic guidelines label Dec 19, 2023
@BillyONeal BillyONeal merged commit e2f6384 into microsoft:master Dec 20, 2023
15 checks passed
@BillyONeal
Copy link
Member

Thanks for the update and for submitting patches upstream!

@dg0yt dg0yt deleted the openssl-update branch December 20, 2023 04:44
@Neumann-A
Copy link
Contributor

Something something broke my clang-cl builds. NATIVE_PATH is probably not working for openssl since the normal windows build already shows:

/*
 * WARNING: do not edit!
 * Generated by util/mkbuildinf.pl
 *
 * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved.
 *
 * Licensed under the Apache License 2.0 (the "License").  You may not use
 * this file except in compliance with the License.  You can obtain a copy
 * in the file LICENSE in the source distribution or at
 * https://www.openssl.org/source/license.html
 */

#define PLATFORM "platform: Files\Microsoft"
#define DATE "built on: Sun Jan  7 08:22:12 2024 UTC"

/*
 * Generate compiler_flags as an array of individual characters. This is a
 * workaround for the situation where CFLAGS gets too long for a C90 string
 * literal
 */
static const char compiler_flags[] = {
    'c','o','m','p','i','l','e','r',':',' ','\'','C',':','\\','P','r',
    'o','g','r','a','m','\0'
};

Which is just wrongly passed from the perl scripts and my clang-cl build just completly choke on invalid
#define PLATFORM "platform: Files\LLVM\bin\clang-cl.exe /Zi /Fdossl_static.pdb /Gs0 /GF /Gy /MD -nologo -DWIN32 -D_WIN64 -D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -D_ATL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D_CRT_INTERNAL_NONSTDC_NAMES -D_CRT_DECLARE_NONSTDC_NAMES -D_FORCENAMELESSUNION -mcrc32 -msse4.2 -maes -mpclmul -arch:AVX2 -utf-8 -std:c11 -D__STDC__=1 -Wno-implicit-function-declaration -WX- -O2 -Oi -MD -fuse-ld=lld-link -Z7 -Brepro -DNDEBUG -DL_ENDIAN -DOPENSSL_PIC -D"OPENSSL_BUILDING_OPENSSL" -D"OPENSSL_SYS_WIN32" -D"WIN32_LEAN_AND_MEAN" -D"UNICODE" -D"_UNICODE" -D"_CRT_SECURE_NO_DEPRECATE" -D"_WINSOCK_DEPRECATED_NO_WARNINGS" -D"NDEBUG"'"

generally all this stuff should be in compiler_flags

@dg0yt
Copy link
Contributor Author

dg0yt commented Jan 7, 2024

The NATIVE_PATH isn't new, at least for non-arm64 windows.

@Neumann-A
Copy link
Contributor

The problem seems to be the full path to cc. The scripts cannot deal with that correctly. The scripts also cannot deal with cmake paths which makes it more compley. Basically only the filenames can be used and everything needs to be on path. CC seems to be the only one with this problem

Osyotr pushed a commit to Osyotr/vcpkg that referenced this pull request Jan 23, 2024
Co-authored-by: مهدي شينون (Mehdi Chinoune) <mehdi.chinoune@hotmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[openssl] update to 3.2.0
5 participants