FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Arduino 3.x support (jackjansen fork) by vidplace7 · Pull Request #8 · meshtastic/esp32_https_server · GitHub

Repository navigation

Arduino 3.x support (jackjansen fork) - #8

Draft
vidplace7 wants to merge 30 commits into
meshtastic:masterfrom
jackjansen:master
Draft

vidplace7 wants to merge 30 commits into
meshtastic:masterfrom
jackjansen:master

Conversation

Copy link
Copy Markdown
Member

do not merge

Applies changes from jackjansen/esp32_idf5_https_server for Arduino 3.x support.

fhessel and others added 30 commits January 23, 2021 20:29
Fix header to existing mbedtls/sha1.h one
# 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

Copy link
Copy Markdown


Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 7 committers have signed the CLA.

✅ caveman99
❌ jasenk2
❌ fhessel
❌ JasenKolev
❌ jackjansen
❌ mhaberler
❌ lewisxhe
You have signed the CLA already but the status is still pending? Let us recheck it.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants


Back | FazBrowse Home | New Git URL