mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10751 from akallabeth/libressl

Browse Source 
[crypto,cert] fix builds with LibRESSL
This commit is contained in:
Martin Fleisz 2024-10-17 13:07:56 +02:00 committed by GitHub
commit 00fdc97861
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libfreerdp/crypto/certificate.c
View File

@ -1281,7 +1281,8 @@ rdpCertificate* freerdp_certificate_new_from_x509(const X509* xcert, const STACK
if (!cert) if (!cert)
return NULL; return NULL;
cert->x509 = X509_dup(xcert); X509* wcert = WINPR_CAST_CONST_PTR_AWAY(xcert, X509*);
cert->x509 = X509_dup(wcert);
if (!cert->x509) if (!cert->x509)
goto fail; goto fail;
@ -1289,7 +1290,7 @@ rdpCertificate* freerdp_certificate_new_from_x509(const X509* xcert, const STACK
goto fail; goto fail;
if (chain) if (chain)
cert->chain = sk_X509_deep_copy(chain, X509_dup, X509_free); cert->chain = sk_X509_deep_copy(chain, X509_const_dup, X509_free);
return cert; return cert;
fail: fail:

50
libfreerdp/crypto/opensslcompat.h
View File

@ -20,10 +20,14 @@
#ifndef FREERDP_LIB_CRYPTO_OPENSSLCOMPAT_H #ifndef FREERDP_LIB_CRYPTO_OPENSSLCOMPAT_H
#define FREERDP_LIB_CRYPTO_OPENSSLCOMPAT_H #define FREERDP_LIB_CRYPTO_OPENSSLCOMPAT_H
#include <winpr/winpr.h>
#include <winpr/assert.h>
#include <freerdp/config.h> #include <freerdp/config.h>
#include <freerdp/api.h> #include <freerdp/api.h>
#include <openssl/x509.h>
#ifdef WITH_OPENSSL #ifdef WITH_OPENSSL
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
@ -61,4 +65,50 @@ void RSA_get0_key(const RSA* r, const BIGNUM** n, const BIGNUM** e, const BIGNUM
#endif /* OPENSSL < 1.1.0 || LIBRESSL */ #endif /* OPENSSL < 1.1.0 || LIBRESSL */
#endif /* WITH_OPENSSL */ #endif /* WITH_OPENSSL */
/* Drop in replacement for older OpenSSL and LibRESSL */
#if defined(LIBRESSL_VERSION_NUMBER) || \
(defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x1010000fL))
static INLINE STACK_OF(X509) * sk_X509_deep_copy(const STACK_OF(X509) * sk,
X509* (*copyfunc)(const X509*),
void (*freefunc)(X509*))
{
WINPR_ASSERT(copyfunc);
WINPR_ASSERT(freefunc);
STACK_OF(X509)* stack = sk_X509_new_null();
if (!stack)
return NULL;
if (sk)
{
for (int i = 0; i < sk_X509_num(sk); i++)
{
X509* cert = sk_X509_value(sk, i);
X509* copy = copyfunc(cert);
if (!copy)
goto fail;
const int rc = sk_X509_push(stack, copy);
if (rc <= 0)
goto fail;
}
}
return stack;
fail:
sk_X509_pop_free(stack, freefunc);
return NULL;
}
#endif
/* OpenSSL API is not const consistent.
* While the TYPE_dup function take non const arguments
* the TYPE_sk versions require the arguments to be const...
*/
static INLINE X509* X509_const_dup(const X509* x509)
{
X509* ptr = WINPR_CAST_CONST_PTR_AWAY(x509, X509*);
return X509_dup(ptr);
}
#endif /* FREERDP_LIB_CRYPTO_OPENSSLCOMPAT_H */ #endif /* FREERDP_LIB_CRYPTO_OPENSSLCOMPAT_H */