Skip to content

[CHERYPICK FIPS 4.0]Fix OPENSSL_memchr per C23 (#3008) #3291

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.

Sign up for GitHub

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

Merged
justsmth merged 1 commit into from
Jun 10, 2026
Merged

[CHERYPICK FIPS 4.0]Fix OPENSSL_memchr per C23 (#3008) #3291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,10 @@ if(GCC OR CLANG)
endif()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings -Wformat-security -Wunused-result -Wno-overlength-strings")
set(C_CXX_FLAGS "${C_CXX_FLAGS} -Wno-c11-extensions -Wvla -Wtype-limits -Wno-unused-parameter")
set(C_CXX_FLAGS "${C_CXX_FLAGS} -Wvla -Wtype-limits -Wno-unused-parameter")
if(CLANG)
set(C_CXX_FLAGS "${C_CXX_FLAGS} -Wno-c11-extensions")
endif()
endif()
set(C_CXX_FLAGS "${C_CXX_FLAGS} -Werror -Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings")

Expand Down
5 changes: 4 additions & 1 deletion crypto/internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,10 @@ static inline void *OPENSSL_memchr(const void *s, int c, size_t n) {
return NULL;
}

return memchr(s, c, n);
// C23 makes memchr const-correct, returning const void * when the input is
// const void *. Some C libraries apply this change even in C11 mode. Cast to
// match our return type.
return (void *)memchr(s, c, n);
}

#endif // __cplusplus
Expand Down
Loading