Arduino 3.x support (jackjansen fork)#8
Draft
vidplace7 wants to merge 30 commits intomeshtastic:mastermeshtastic/esp32_https_server:masterfrom
Draft
Arduino 3.x support (jackjansen fork)#8vidplace7 wants to merge 30 commits intomeshtastic:mastermeshtastic/esp32_https_server:masterfrom
vidplace7 wants to merge 30 commits intomeshtastic:mastermeshtastic/esp32_https_server:masterfrom
Conversation
Fix header to existing mbedtls/sha1.h one
This reverts commit d4dd455.
# Conflicts: # src/HTTPConnection.hpp # src/WebsocketHandler.cpp
src/SSLCert.cpp: In function 'int httpsserver::cert_write(SSLCert&, std::string, std::string, std::string)':
src/SSLCert.cpp:184:33: error: too few arguments to function 'int mbedtls_pk_parse_key(mbedtls_pk_context*, const unsigned char*, size_t, const unsigned char*, size_t, int (*)(void*, unsigned char*, size_t), void*)'
184 | stepRes = mbedtls_pk_parse_key( &key, certCtx.getPKData(), certCtx.getPKLength(), NULL, 0 );
| ~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from src/SSLCert.hpp:11,
from src/SSLCert.cpp:1:
/Users/mah/.platformio/packages/framework-arduinoespressif32-libs/esp32s3/include/mbedtls/mbedtls/include/mbedtls/pk.h:1101:5: note: declared here
1101 | int mbedtls_pk_parse_key(mbedtls_pk_context *ctx,
| ^~~~~~~~~~~~~~~~~~~~
esptool.py v4.7.5
Creating esp32s3 image...
Merged 1 ELF section
Successfully created esp32s3 image.
src/SSLCert.cpp:233:13: error: 'mbedtls_x509write_crt_set_serial' was not declared in this scope; did you mean 'mbedtls_x509write_crt_set_version'?
233 | stepRes = mbedtls_x509write_crt_set_serial( &crt, &serial );
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| mbedtls_x509write_crt_set_version
Generating partitions .pio/build/custom-server/partitions.bin
*** [.pio/build/custom-server/src/SSLCert.cpp.o] Error 1
The mbedtls_pk_parse_key() has two new paramters with the new 3.x API in. Fix the call of mbedtls_pk_parse_key()
works with both stable and develop branches
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
do not merge
Applies changes from jackjansen/esp32_idf5_https_server for Arduino 3.x support.