@@ -326,110 +326,14 @@ win32:INCLUDEPATH +=
326326 dependencies /hidapi -win /include \
327327 dependencies /winring0 /include \
328328 dependencies /libusb -1 .0 .27 /include \
329- dependencies /mbedtls -2 . 28 . 8 /include \
329+ dependencies /mbedtls -3 . 2 . 1 /include \
330330 dependencies /NVFC \
331331 wmi / \
332332
333333win32 :SOURCES += $$CONTROLLER_CPP_WINDOWS
334334
335335win32 :SOURCES += \
336336 dependencies /hueplusplus -1 .2 .0 /src /WinHttpHandler . cpp \
337- dependencies /mbedtls -2 .28 .8 /library /aes . c \
338- dependencies /mbedtls -2 .28 .8 /library /aesni . c \
339- dependencies /mbedtls -2 .28 .8 /library /arc4 . c \
340- dependencies /mbedtls -2 .28 .8 /library /aria . c \
341- dependencies /mbedtls -2 .28 .8 /library /asn1parse . c \
342- dependencies /mbedtls -2 .28 .8 /library /asn1write . c \
343- dependencies /mbedtls -2 .28 .8 /library /base64 . c \
344- dependencies /mbedtls -2 .28 .8 /library /bignum . c \
345- dependencies /mbedtls -2 .28 .8 /library /blowfish . c \
346- dependencies /mbedtls -2 .28 .8 /library /camellia . c \
347- dependencies /mbedtls -2 .28 .8 /library /ccm . c \
348- dependencies /mbedtls -2 .28 .8 /library /certs . c \
349- dependencies /mbedtls -2 .28 .8 /library /chacha20 . c \
350- dependencies /mbedtls -2 .28 .8 /library /chachapoly . c \
351- dependencies /mbedtls -2 .28 .8 /library /cipher . c \
352- dependencies /mbedtls -2 .28 .8 /library /cipher_wrap . c \
353- dependencies /mbedtls -2 .28 .8 /library /cmac . c \
354- dependencies /mbedtls -2 .28 .8 /library /constant_time . c \
355- dependencies /mbedtls -2 .28 .8 /library /ctr_drbg . c \
356- dependencies /mbedtls -2 .28 .8 /library /debug . c \
357- dependencies /mbedtls -2 .28 .8 /library /des . c \
358- dependencies /mbedtls -2 .28 .8 /library /dhm . c \
359- dependencies /mbedtls -2 .28 .8 /library /ecdh . c \
360- dependencies /mbedtls -2 .28 .8 /library /ecdsa . c \
361- dependencies /mbedtls -2 .28 .8 /library /ecjpake . c \
362- dependencies /mbedtls -2 .28 .8 /library /ecp . c \
363- dependencies /mbedtls -2 .28 .8 /library /ecp_curves . c \
364- dependencies /mbedtls -2 .28 .8 /library /entropy . c \
365- dependencies /mbedtls -2 .28 .8 /library /entropy_poll . c \
366- dependencies /mbedtls -2 .28 .8 /library /error . c \
367- dependencies /mbedtls -2 .28 .8 /library /gcm . c \
368- dependencies /mbedtls -2 .28 .8 /library /havege . c \
369- dependencies /mbedtls -2 .28 .8 /library /hkdf . c \
370- dependencies /mbedtls -2 .28 .8 /library /hmac_drbg . c \
371- dependencies /mbedtls -2 .28 .8 /library /md2 . c \
372- dependencies /mbedtls -2 .28 .8 /library /md4 . c \
373- dependencies /mbedtls -2 .28 .8 /library /md5 . c \
374- dependencies /mbedtls -2 .28 .8 /library /md . c \
375- dependencies /mbedtls -2 .28 .8 /library /memory_buffer_alloc . c \
376- dependencies /mbedtls -2 .28 .8 /library /mps_reader . c \
377- dependencies /mbedtls -2 .28 .8 /library /mps_trace . c \
378- dependencies /mbedtls -2 .28 .8 /library /net_sockets . c \
379- dependencies /mbedtls -2 .28 .8 /library /nist_kw . c \
380- dependencies /mbedtls -2 .28 .8 /library /oid . c \
381- dependencies /mbedtls -2 .28 .8 /library /padlock . c \
382- dependencies /mbedtls -2 .28 .8 /library /pem . c \
383- dependencies /mbedtls -2 .28 .8 /library /pk . c \
384- dependencies /mbedtls -2 .28 .8 /library /pkcs11 . c \
385- dependencies /mbedtls -2 .28 .8 /library /pkcs12 . c \
386- dependencies /mbedtls -2 .28 .8 /library /pkcs5 . c \
387- dependencies /mbedtls -2 .28 .8 /library /pkparse . c \
388- dependencies /mbedtls -2 .28 .8 /library /pk_wrap . c \
389- dependencies /mbedtls -2 .28 .8 /library /pkwrite . c \
390- dependencies /mbedtls -2 .28 .8 /library /platform . c \
391- dependencies /mbedtls -2 .28 .8 /library /platform_util . c \
392- dependencies /mbedtls -2 .28 .8 /library /poly1305 . c \
393- dependencies /mbedtls -2 .28 .8 /library /psa_crypto_aead . c \
394- dependencies /mbedtls -2 .28 .8 /library /psa_crypto . c \
395- dependencies /mbedtls -2 .28 .8 /library /psa_crypto_cipher . c \
396- dependencies /mbedtls -2 .28 .8 /library /psa_crypto_client . c \
397- dependencies /mbedtls -2 .28 .8 /library /psa_crypto_driver_wrappers . c \
398- dependencies /mbedtls -2 .28 .8 /library /psa_crypto_ecp . c \
399- dependencies /mbedtls -2 .28 .8 /library /psa_crypto_hash . c \
400- dependencies /mbedtls -2 .28 .8 /library /psa_crypto_mac . c \
401- dependencies /mbedtls -2 .28 .8 /library /psa_crypto_rsa . c \
402- dependencies /mbedtls -2 .28 .8 /library /psa_crypto_se . c \
403- dependencies /mbedtls -2 .28 .8 /library /psa_crypto_slot_management . c \
404- dependencies /mbedtls -2 .28 .8 /library /psa_crypto_storage . c \
405- dependencies /mbedtls -2 .28 .8 /library /psa_its_file . c \
406- dependencies /mbedtls -2 .28 .8 /library /ripemd160 . c \
407- dependencies /mbedtls -2 .28 .8 /library /rsa . c \
408- dependencies /mbedtls -2 .28 .8 /library /rsa_internal . c \
409- dependencies /mbedtls -2 .28 .8 /library /sha1 . c \
410- dependencies /mbedtls -2 .28 .8 /library /sha256 . c \
411- dependencies /mbedtls -2 .28 .8 /library /sha512 . c \
412- dependencies /mbedtls -2 .28 .8 /library /ssl_cache . c \
413- dependencies /mbedtls -2 .28 .8 /library /ssl_ciphersuites . c \
414- dependencies /mbedtls -2 .28 .8 /library /ssl_cli . c \
415- dependencies /mbedtls -2 .28 .8 /library /ssl_cookie . c \
416- dependencies /mbedtls -2 .28 .8 /library /ssl_msg . c \
417- dependencies /mbedtls -2 .28 .8 /library /ssl_srv . c \
418- dependencies /mbedtls -2 .28 .8 /library /ssl_ticket . c \
419- dependencies /mbedtls -2 .28 .8 /library /ssl_tls13_keys . c \
420- dependencies /mbedtls -2 .28 .8 /library /ssl_tls . c \
421- dependencies /mbedtls -2 .28 .8 /library /threading . c \
422- dependencies /mbedtls -2 .28 .8 /library /timing . c \
423- dependencies /mbedtls -2 .28 .8 /library /version . c \
424- dependencies /mbedtls -2 .28 .8 /library /version_features . c \
425- dependencies /mbedtls -2 .28 .8 /library /x509 . c \
426- dependencies /mbedtls -2 .28 .8 /library /x509_create . c \
427- dependencies /mbedtls -2 .28 .8 /library /x509_crl . c \
428- dependencies /mbedtls -2 .28 .8 /library /x509_crt . c \
429- dependencies /mbedtls -2 .28 .8 /library /x509_csr . c \
430- dependencies /mbedtls -2 .28 .8 /library /x509write_crt . c \
431- dependencies /mbedtls -2 .28 .8 /library /x509write_csr . c \
432- dependencies /mbedtls -2 .28 .8 /library /xtea . c \
433337 dependencies /NVFC /nvapi . cpp \
434338 i2c_smbus /i2c_smbus_amdadl . cpp \
435339 i2c_smbus /i2c_smbus_i801 . cpp \
@@ -465,6 +369,7 @@ win32:contains(QMAKE_TARGET.arch, x86_64) {
465369 -L "$$PWD/dependencies/winring0/x64/" -lWinRing0x64 \
466370 -L "$$PWD/dependencies/libusb-1.0.27/VS2019/MS64/dll" -llibusb -1 .0 \
467371 -L "$$PWD/dependencies/hidapi-win/x64/" -lhidapi \
372+ -L "$$PWD/dependencies/mbedtls-3.2.1/lib/x64/" -lmbedcrypto -lmbedtls -lmbedx509 \
468373}
469374
470375win32 :contains(QMAKE_TARGET . arch, x86) {
@@ -474,6 +379,7 @@ win32:contains(QMAKE_TARGET.arch, x86) {
474379 -L "$$PWD/dependencies/winring0/Win32/" -lWinRing0 \
475380 -L "$$PWD/dependencies/libusb-1.0.27/VS2019/MS32/dll" -llibusb -1 .0 \
476381 -L "$$PWD/dependencies/hidapi-win/x86/" -lhidapi \
382+ -L "$$PWD/dependencies/mbedtls-3.2.1/lib/x86/" -lmbedcrypto -lmbedtls -lmbedx509 \
477383}
478384
479385win32 :DEFINES -= \
@@ -557,10 +463,10 @@ contains(QMAKE_PLATFORM, linux) {
557463
558464 INCLUDEPATH += \
559465 dependencies /NVFC \
560- /usr /include /mbedtls2 / \
466+ /usr /include /mbedtls / \
561467
562468 LIBS += \
563- -L /usr /lib /mbedtls2 / \
469+ -L /usr /lib /mbedtls / \
564470 -lmbedx509 \
565471 -lmbedtls \
566472 -lmbedcrypto \
@@ -803,8 +709,8 @@ macx {
803709
804710 SOURCES += $$CONTROLLER_CPP_MACOS
805711
806- # Use mbedtls v2 instead of latest
807- MBEDTLS_PREFIX = $$system(brew --prefix mbedtls @ 2 )
712+ # Use mbedtls
713+ MBEDTLS_PREFIX = $$system(brew --prefix mbedtls )
808714
809715 INCLUDEPATH += \
810716 $$MBEDTLS_PREFIX /include \
0 commit comments