asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #42098 from Faless/crypto/mbedtls_2.16.8_fix

Browse source 
Fix certificate generation with mbedtls 2.16.8 .
This commit is contained in:
Rémi Verschelde 2020-09-15 19:26:26 +02:00 committed by GitHub
commit 6f4384f206
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
modules/mbedtls/crypto_mbedtls.cpp
View file

@ -43,8 +43,8 @@
#define PEM_BEGIN_CRT "-----BEGIN CERTIFICATE-----\n" #define PEM_BEGIN_CRT "-----BEGIN CERTIFICATE-----\n"
#define PEM_END_CRT "-----END CERTIFICATE-----\n" #define PEM_END_CRT "-----END CERTIFICATE-----\n"
#include "mbedtls/pem.h"
#include <mbedtls/debug.h> #include <mbedtls/debug.h>
#include <mbedtls/pem.h>
CryptoKey *CryptoKeyMbedTLS::create() { CryptoKey *CryptoKeyMbedTLS::create() {
return memnew(CryptoKeyMbedTLS); return memnew(CryptoKeyMbedTLS);
@ -294,20 +294,15 @@ Ref<X509Certificate> CryptoMbedTLS::generate_self_signed_certificate(Ref<CryptoK
unsigned char buf[4096]; unsigned char buf[4096];
memset(buf, 0, 4096); memset(buf, 0, 4096);
Ref<X509CertificateMbedTLS> out; int ret = mbedtls_x509write_crt_pem(&crt, buf, 4096, mbedtls_ctr_drbg_random, &ctr_drbg);
out.instance();
mbedtls_x509write_crt_pem(&crt, buf, 4096, mbedtls_ctr_drbg_random, &ctr_drbg);
int err = mbedtls_x509_crt_parse(&(out->cert), buf, 4096);
if (err != 0) {
mbedtls_mpi_free(&serial);
mbedtls_x509write_crt_free(&crt);
ERR_PRINT("Generated invalid certificate: " + itos(err));
return nullptr;
}
mbedtls_mpi_free(&serial); mbedtls_mpi_free(&serial);
mbedtls_x509write_crt_free(&crt); mbedtls_x509write_crt_free(&crt);
ERR_FAIL_COND_V_MSG(ret != 0, nullptr, "Failed to generate certificate: " + itos(ret));
buf[4095] = '\0'; // Make sure strlen can't fail.
Ref<X509CertificateMbedTLS> out;
out.instance();
out->load_from_memory(buf, strlen((char *)buf) + 1); // Use strlen to find correct output size.
return out; return out;
} }