Skip to content

Standard Arduino ESP library already contains base64.h file: #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yurik72 merged 1 commit into from
Mar 1, 2021
Merged

Standard Arduino ESP library already contains base64.h file: #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arduino_homekit_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <wolfssl/wolfcrypt/coding.h>

//#include "constants.h"
#include "base64.h"
#include "esphap_base64.h"
#include "pairing.h"
#include "storage.h"
#include "query_params.h"
Expand Down
2 changes: 1 addition & 1 deletion arduino_homekit_server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern "C" {
#endif

//#include "constants.h"
#include "base64.h"
#include "esphap_base64.h"
#include "crypto.h"

#include "pairing.h"
Expand Down
2 changes: 1 addition & 1 deletion base64.c → esphap_base64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "base64.h"
#include "esphap_base64.h"

static unsigned char base64_chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";

Expand Down
0 base64.h → esphap_base64.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <wolfssl/wolfcrypt/hash.h>
#include <wolfssl/wolfcrypt/coding.h>

#include "base64.h"
#include "esphap_base64.h"
#include "crypto.h"
#include "pairing.h"
#include "storage.h"
Expand Down
4 changes: 2 additions & 2 deletions serverA8266.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <wolfssl/wolfcrypt/hash.h>
#include <wolfssl/wolfcrypt/coding.h>

#include "base64.h"
#include "esphap_base64.h"
#include "crypto.h"
#include "pairing.h"
#include "storage.h"
Expand Down Expand Up @@ -3721,4 +3721,4 @@ int homekit_get_setup_uri(const homekit_server_config_t *config, char *buffer, s

return 0;
}
#endif
#endif
2 changes: 1 addition & 1 deletion serverA8266.not
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ extern "C" {
#include <wolfssl/wolfcrypt/hash.h>
#include <wolfssl/wolfcrypt/coding.h>

#include "base64.h"
#include "esphap_base64.h"
#include "crypto.h"
#include "pairing.h"
#include "storage.h"
Expand Down