Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-30 00:00:16 +01:00
Code Issues Releases Wiki Activity

mbedtls_wrapper: Modify 'd2i_X509' with standard declaration in openssl

Browse source 
https://github.com/warmcat/libwebsockets/pull/3095

Signed-off-by: makejian <makejian@xiaomi.com>
This commit is contained in:
makejian 2024-03-18 19:38:43 +08:00 • committed by Andy Green
parent c57c239368
commit 0d76f0950a
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/tls/mbedtls/mbedtls-client.c
View file

@ -378,7 +378,7 @@ lws_tls_client_create_vhost_context(struct lws_vhost *vh,
unsigned int key_mem_len unsigned int key_mem_len
) )
{ {
X509 *d2i_X509(X509 **cert, const unsigned char *buffer, long len); X509 *d2i_X509(X509 **cert, const unsigned char **buffer, long len);
SSL_METHOD *method = (SSL_METHOD *)TLS_client_method(); SSL_METHOD *method = (SSL_METHOD *)TLS_client_method();
unsigned long error; unsigned long error;
int n; int n;
@ -418,13 +418,13 @@ lws_tls_client_create_vhost_context(struct lws_vhost *vh,
lwsl_err("Load CA cert file %s failed\n", ca_filepath); lwsl_err("Load CA cert file %s failed\n", ca_filepath);
return 1; return 1;
} }
vh->tls.x509_client_CA = d2i_X509(NULL, buf, (long)len); vh->tls.x509_client_CA = d2i_X509(NULL, (const uint8_t **)&buf, (long)len);
free(buf); free(buf);
lwsl_info("Loading vh %s client CA for verification %s\n", vh->name, ca_filepath); lwsl_info("Loading vh %s client CA for verification %s\n", vh->name, ca_filepath);
#endif #endif
} else { } else {
vh->tls.x509_client_CA = d2i_X509(NULL, (uint8_t*)ca_mem, (long)ca_mem_len); vh->tls.x509_client_CA = d2i_X509(NULL, (const uint8_t **)&ca_mem, (long)ca_mem_len);
lwsl_info("%s: using mem client CA cert %d\n", lwsl_info("%s: using mem client CA cert %d\n",
__func__, ca_mem_len); __func__, ca_mem_len);
} }

2
lib/tls/mbedtls/wrapper/include/internal/ssl_x509.h
View file

@ -52,7 +52,7 @@ X509* X509_new(void);
* *
* @return X509 certification object point * @return X509 certification object point
*/ */
X509* d2i_X509(X509 **cert, const unsigned char *buffer, long len); X509* d2i_X509(X509 **cert, const unsigned char **buffer, long len);
/** /**
* @brief free a X509 certification object * @brief free a X509 certification object

10
lib/tls/mbedtls/wrapper/library/ssl_x509.c
View file

@ -86,7 +86,7 @@ void X509_free(X509 *x)
* @brief load a character certification context into system context. If '*cert' is pointed to the * @brief load a character certification context into system context. If '*cert' is pointed to the
* certification, then load certification into it. Or create a new X509 certification object * certification, then load certification into it. Or create a new X509 certification object
*/ */
X509* d2i_X509(X509 **cert, const unsigned char *buffer, long len) X509* d2i_X509(X509 **cert, const unsigned char **buffer, long len)
{ {
int m = 0; int m = 0;
int ret; int ret;
@ -106,7 +106,7 @@ X509* d2i_X509(X509 **cert, const unsigned char *buffer, long len)
m = 1; m = 1;
} }
ret = X509_METHOD_CALL(load, x, buffer, (int)len); ret = X509_METHOD_CALL(load, x, *buffer, (int)len);
if (ret) { if (ret) {
SSL_DEBUG(SSL_PKEY_ERROR_LEVEL, "X509_METHOD_CALL(load) return %d", ret); SSL_DEBUG(SSL_PKEY_ERROR_LEVEL, "X509_METHOD_CALL(load) return %d", ret);
goto failed2; goto failed2;
@ -178,7 +178,7 @@ int SSL_CTX_add_client_CA_ASN1(SSL_CTX *ctx, int len,
{ {
SSL_ASSERT1(ctx); SSL_ASSERT1(ctx);
if (!d2i_X509(&ctx->client_CA, d, len)) { if (!d2i_X509(&ctx->client_CA, &d, len)) {
SSL_DEBUG(SSL_PKEY_ERROR_LEVEL, "d2i_X509() return NULL"); SSL_DEBUG(SSL_PKEY_ERROR_LEVEL, "d2i_X509() return NULL");
return 0; return 0;
} }
@ -259,7 +259,7 @@ int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len,
int ret; int ret;
X509 *x; X509 *x;
x = d2i_X509(NULL, d, len); x = d2i_X509(NULL, &d, len);
if (!x) { if (!x) {
SSL_DEBUG(SSL_PKEY_ERROR_LEVEL, "d2i_X509() return NULL"); SSL_DEBUG(SSL_PKEY_ERROR_LEVEL, "d2i_X509() return NULL");
goto failed1; goto failed1;
@ -287,7 +287,7 @@ int SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len)
int ret; int ret;
X509 *x; X509 *x;
x = d2i_X509(NULL, d, len); x = d2i_X509(NULL, &d, len);
if (!x) { if (!x) {
SSL_DEBUG(SSL_PKEY_ERROR_LEVEL, "d2i_X509() return NULL"); SSL_DEBUG(SSL_PKEY_ERROR_LEVEL, "d2i_X509() return NULL");
goto failed1; goto failed1;