Skip to content

Better OpenSSL headers include based on headers version. #1213

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
COM8 merged 2 commits into from
Apr 28, 2025
Merged

Better OpenSSL headers include based on headers version. #1213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e339ea4
Better OpenSSL headers include based on headers version.
T-Maxxx Apr 21, 2025
aaa4167
Fixup for linter error for OPENSSL_VERSION_NUMBER.
T-Maxxx Apr 28, 2025
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,6 @@ compile_commands.json

# macOS
.DS_Store

# CLion
.idea/
13 changes: 9 additions & 4 deletions cpr/ssl_ctx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,27 @@

#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/opensslv.h>
#include <openssl/pem.h>
#include <openssl/pemerr.h>
#include <openssl/ssl.h>
#include <openssl/x509.h>
#include <openssl/x509_vfy.h>

// openssl/types.h was added in later version of openssl and is therefore not always available.
// This is for example the case on Ubuntu 20.04.
// openssl/types.h was added in later version of openssl (starting from 3.0.0) and is therefore not always available.
// This is for example the case on Ubuntu 20.04 or Centos 7.
// We try to include it if available to satisfy clang-tidy.
// Ref: https://github.com/openssl/openssl/commit/50cd4768c6b89c757645f28519236bb989216f8d
#if __has_include(<openssl/types.h>)
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
#include <openssl/types.h>
#else
#include <openssl/ossl_typ.h>
#endif

// openssl/pemerr.h was added in 1.1.1a
#if OPENSSL_VERSION_NUMBER >= 0x1010101fL
#include <openssl/pemerr.h>
#endif

namespace cpr {

/**
Expand Down
Loading