isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move OpenSSL compat defines to sudo_ssl_compat.h

Browse Source
This commit is contained in:
Todd C. Miller
2023-08-05 14:16:39 -06:00
parent d6d467b92e
commit fc7bfd5046
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/hostcheck.h
View File

@@ -21,6 +21,13 @@
# include <openssl/x509v3.h> # include <openssl/x509v3.h>
/*
* Compatibility defines for OpenSSL 1.0.2 (not needed for 1.1.x)
*/
# if !defined(HAVE_ASN1_STRING_GET0_DATA) && !defined(HAVE_WOLFSSL)
# define ASN1_STRING_get0_data(x) ASN1_STRING_data(x)
# endif /* !HAVE_ASN1_STRING_GET0_DATA && !HAVE_WOLFSSL */
typedef enum { typedef enum {
MatchFound, MatchFound,
MatchNotFound, MatchNotFound,

15
include/sudo_compat.h
View File

@@ -305,21 +305,6 @@ int getdomainname(char *, size_t);
# define fseeko(f, o, w) fseek((f), (long)(o), (w)) # define fseeko(f, o, w) fseek((f), (long)(o), (w))
#endif #endif
/*
* Compatibility defines for OpenSSL 1.0.2 (not needed for 1.1.x)
*/
#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL)
# ifndef HAVE_X509_STORE_CTX_GET0_CERT
# define X509_STORE_CTX_get0_cert(x) ((x)->cert)
# endif
# ifndef HAVE_ASN1_STRING_GET0_DATA
# define ASN1_STRING_get0_data(x) ASN1_STRING_data(x)
# endif
# ifndef HAVE_TLS_METHOD
# define TLS_method() SSLv23_method()
# endif
#endif /* HAVE_OPENSSL && !HAVE_WOLFSSL */
/* /*
* Functions "missing" from libc. * Functions "missing" from libc.
* All libc replacements are prefixed with "sudo_" to avoid namespace issues. * All libc replacements are prefixed with "sudo_" to avoid namespace issues.

15
include/sudo_ssl_compat.h
View File

@@ -21,6 +21,21 @@
# ifdef HAVE_OPENSSL # ifdef HAVE_OPENSSL
/*
* Compatibility defines for OpenSSL 1.0.2 (not needed for 1.1.x)
*/
# ifndef HAVE_WOLFSSL
# ifndef HAVE_X509_STORE_CTX_GET0_CERT
# define X509_STORE_CTX_get0_cert(x) ((x)->cert)
# endif
# ifndef HAVE_TLS_METHOD
# define TLS_method() SSLv23_method()
# endif
# endif /* !HAVE_WOLFSSL */
/*
* SSL_read_ex() and SSL_write_ex() were added in OpenSSL 1.1.1.
*/
# ifndef HAVE_SSL_READ_EX # ifndef HAVE_SSL_READ_EX
int SSL_read_ex(SSL *, void *, size_t, size_t *); int SSL_read_ex(SSL *, void *, size_t, size_t *);
int SSL_write_ex(SSL *, const void *, size_t, size_t *); int SSL_write_ex(SSL *, const void *, size_t, size_t *);