The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-11-27 13:44:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #201 from wiidev/master

Browse Source 
Use MEM2 and improve formatting
This commit is contained in:
Fledge68 2020-09-14 15:21:40 -05:00 committed by GitHub
commit 2405ad2aab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 127 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

220
source/network/base64.h
View File

@ -31,141 +31,143 @@
#ifndef BASE64_H #ifndef BASE64_H
#define BASE64_H #define BASE64_H
#include <stdio.h> #include "memory/mem2.hpp"
#include <stdlib.h>
static const char* b64="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; static const char *b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
// maps A=>0,B=>1.. // maps A=>0,B=>1..
static const unsigned char unb64[]={ static const unsigned char unb64[]={
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //10 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //10
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //20 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //20
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //30 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //30
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //40 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //40
0, 0, 0, 62, 0, 0, 0, 63, 52, 53, //50 0, 0, 0, 62, 0, 0, 0, 63, 52, 53, //50
54, 55, 56, 57, 58, 59, 60, 61, 0, 0, //60 54, 55, 56, 57, 58, 59, 60, 61, 0, 0, //60
0, 0, 0, 0, 0, 0, 1, 2, 3, 4, //70 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, //70
5, 6, 7, 8, 9, 10, 11, 12, 13, 14, //80 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, //80
15, 16, 17, 18, 19, 20, 21, 22, 23, 24, //90 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, //90
25, 0, 0, 0, 0, 0, 0, 26, 27, 28, //100 25, 0, 0, 0, 0, 0, 0, 26, 27, 28, //100
29, 30, 31, 32, 33, 34, 35, 36, 37, 38, //110 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, //110
39, 40, 41, 42, 43, 44, 45, 46, 47, 48, //120 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, //120
49, 50, 51, 0, 0, 0, 0, 0, 0, 0, //130 49, 50, 51, 0, 0, 0, 0, 0, 0, 0, //130
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //140 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //140
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //150 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //150
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //160 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //160
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //170 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //170
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //180 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //180
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //190 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //190
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //200 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //200
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //210 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //210
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //220 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //220
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //230 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //230
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //240 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //240
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //250 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //250
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
}; // This array has 256 elements }; // This array has 256 elements
// Converts binary data of length=len to base64 characters. // Converts binary data of length=len to base64 characters.
// Length of the resultant string is stored in flen // Length of the resultant string is stored in flen
// (you must pass pointer flen). // (you must pass pointer flen).
char* base64( const void* binaryData, int len, int *flen ) char *base64(const void *binaryData, int len, int *flen)
{ {
const unsigned char* bin = (const unsigned char*) binaryData; const unsigned char *bin = (const unsigned char *)binaryData;
char* res; char *res;
int rc = 0; // result counter int rc = 0; // result counter
int byteNo; // I need this after the loop int byteNo; // I need this after the loop
int modulusLen = len % 3; int modulusLen = len % 3;
int pad = ((modulusLen&1)<<1) + ((modulusLen&2)>>1); // 2 gives 1 and 1 gives 2, but 0 gives 0. int pad = ((modulusLen & 1) << 1) + ((modulusLen & 2) >> 1); // 2 gives 1 and 1 gives 2, but 0 gives 0.
*flen = 4*(len + pad)/3; *flen = 4 * (len + pad) / 3;
res = (char*) malloc( *flen + 1 ); // and one for the null res = (char *)MEM2_alloc(*flen + 1); // and one for the null
if( !res ) if (!res)
return 0; return 0;
for( byteNo = 0; byteNo <= len-3; byteNo+=3 ) for (byteNo = 0; byteNo <= len - 3; byteNo += 3)
{ {
unsigned char BYTE0=bin[byteNo]; unsigned char BYTE0 = bin[byteNo];
unsigned char BYTE1=bin[byteNo+1]; unsigned char BYTE1 = bin[byteNo + 1];
unsigned char BYTE2=bin[byteNo+2]; unsigned char BYTE2 = bin[byteNo + 2];
res[rc++] = b64[ BYTE0 >> 2 ]; res[rc++] = b64[BYTE0 >> 2];
res[rc++] = b64[ ((0x3&BYTE0)<<4) + (BYTE1 >> 4) ]; res[rc++] = b64[((0x3 & BYTE0) << 4) + (BYTE1 >> 4)];
res[rc++] = b64[ ((0x0f&BYTE1)<<2) + (BYTE2>>6) ]; res[rc++] = b64[((0x0f & BYTE1) << 2) + (BYTE2 >> 6)];
res[rc++] = b64[ 0x3f&BYTE2 ]; res[rc++] = b64[0x3f & BYTE2];
} }
if( pad==2 ) if (pad == 2)
{ {
res[rc++] = b64[ bin[byteNo] >> 2 ]; res[rc++] = b64[bin[byteNo] >> 2];
res[rc++] = b64[ (0x3&bin[byteNo])<<4 ]; res[rc++] = b64[(0x3 & bin[byteNo]) << 4];
res[rc++] = '='; res[rc++] = '=';
res[rc++] = '='; res[rc++] = '=';
} }
else if( pad==1 ) else if (pad == 1)
{ {
res[rc++] = b64[ bin[byteNo] >> 2 ]; res[rc++] = b64[bin[byteNo] >> 2];
res[rc++] = b64[ ((0x3&bin[byteNo])<<4) + (bin[byteNo+1] >> 4) ]; res[rc++] = b64[((0x3 & bin[byteNo]) << 4) + (bin[byteNo + 1] >> 4)];
res[rc++] = b64[ (0x0f&bin[byteNo+1])<<2 ]; res[rc++] = b64[(0x0f & bin[byteNo + 1]) << 2];
res[rc++] = '='; res[rc++] = '=';
} }
res[rc]=0; // NULL TERMINATOR!;) res[rc] = 0; // NULL TERMINATOR!;)
return res; return res;
} }
unsigned char* unbase64( const char* ascii, int len, int *flen ) unsigned char *unbase64(const char *ascii, int len, int *flen)
{ {
const unsigned char *safeAsciiPtr = (const unsigned char*)ascii; const unsigned char *safeAsciiPtr = (const unsigned char *)ascii;
unsigned char *bin; unsigned char *bin;
int cb=0; int cb = 0;
int charNo; int charNo;
int pad = 0; int pad = 0;
if ((len <= 0) || (len % 4 != 0)) { // 2 accesses below would be OOB. if ((len <= 0) || (len % 4 != 0))
// catch empty string or incorrect padding size, return NULL as result. { // 2 accesses below would be OOB.
*flen=0; // catch empty string or incorrect padding size, return NULL as result.
return 0; *flen = 0;
} return 0;
if( safeAsciiPtr[ len-1 ]=='=' ) ++pad; }
if( safeAsciiPtr[ len-2 ]=='=' ) ++pad; if (safeAsciiPtr[len - 1] == '=')
++pad;
if (safeAsciiPtr[len - 2] == '=')
++pad;
*flen = 3*len/4 - pad; *flen = 3 * len / 4 - pad;
bin = (unsigned char*)malloc( *flen ); bin = (unsigned char *)MEM2_alloc(*flen);
if( !bin ) if (!bin)
return 0; return 0;
for( charNo=0; charNo <= len - 4 - pad; charNo+=4 ) for (charNo = 0; charNo <= len - 4 - pad; charNo += 4)
{ {
int A=unb64[safeAsciiPtr[charNo]]; int A = unb64[safeAsciiPtr[charNo]];
int B=unb64[safeAsciiPtr[charNo+1]]; int B = unb64[safeAsciiPtr[charNo + 1]];
int C=unb64[safeAsciiPtr[charNo+2]]; int C = unb64[safeAsciiPtr[charNo + 2]];
int D=unb64[safeAsciiPtr[charNo+3]]; int D = unb64[safeAsciiPtr[charNo + 3]];
bin[cb++] = (A<<2) | (B>>4); bin[cb++] = (A << 2) | (B >> 4);
bin[cb++] = (B<<4) | (C>>2); bin[cb++] = (B << 4) | (C >> 2);
bin[cb++] = (C<<6) | (D); bin[cb++] = (C << 6) | (D);
} }
if( pad==1 ) if (pad == 1)
{ {
int A=unb64[safeAsciiPtr[charNo]]; int A = unb64[safeAsciiPtr[charNo]];
int B=unb64[safeAsciiPtr[charNo+1]]; int B = unb64[safeAsciiPtr[charNo + 1]];
int C=unb64[safeAsciiPtr[charNo+2]]; int C = unb64[safeAsciiPtr[charNo + 2]];
bin[cb++] = (A<<2) | (B>>4);
bin[cb++] = (B<<4) | (C>>2);
}
else if( pad==2 )
{
int A=unb64[safeAsciiPtr[charNo]];
int B=unb64[safeAsciiPtr[charNo+1]];
bin[cb++] = (A<<2) | (B>>4); bin[cb++] = (A << 2) | (B >> 4);
} bin[cb++] = (B << 4) | (C >> 2);
}
else if (pad == 2)
{
int A = unb64[safeAsciiPtr[charNo]];
int B = unb64[safeAsciiPtr[charNo + 1]];
return bin; bin[cb++] = (A << 2) | (B >> 4);
}
return bin;
} }
#endif #endif

20
source/network/https.c
View File

@ -268,7 +268,7 @@ bool connect_proxy(HTTP_INFO *httpinfo, char *host, char *username, char *passwo
if (!(auth = base64(credentials, strlen(credentials), &len))) if (!(auth = base64(credentials, strlen(credentials), &len)))
return false; return false;
len = snprintf(request, sizeof(request), "CONNECT %s:%i HTTP/1.1\r\nProxy-Authorization: Basic %s\r\nUser-Agent: curl/7.55.1\r\n\r\n", host, httpinfo->use_https ? 443 : 80, auth); len = snprintf(request, sizeof(request), "CONNECT %s:%i HTTP/1.1\r\nProxy-Authorization: Basic %s\r\nUser-Agent: curl/7.55.1\r\n\r\n", host, httpinfo->use_https ? 443 : 80, auth);
free(auth); MEM2_free(auth);
} }
else else
len = snprintf(request, sizeof(request), "CONNECT %s:%i HTTP/1.1\r\nUser-Agent: curl/7.55.1\r\n\r\n", host, httpinfo->use_https ? 443 : 80); len = snprintf(request, sizeof(request), "CONNECT %s:%i HTTP/1.1\r\nUser-Agent: curl/7.55.1\r\n\r\n", host, httpinfo->use_https ? 443 : 80);
@ -475,15 +475,15 @@ void downloadfile(const char *url, struct download *buffer)
int ret, len; int ret, len;
if (strncmp(host, "www.geckocodes.org", 18) != 0) if (strncmp(host, "www.geckocodes.org", 18) != 0)
memset(isgecko, 0, sizeof(isgecko)); // Not geckocodes, so don't set a cookie memset(isgecko, 0, sizeof(isgecko)); // Not geckocodes, so don't set a cookie
len = snprintf(request, sizeof(request), len = snprintf(request, sizeof(request),
"GET %s HTTP/1.1\r\n" "GET %s HTTP/1.1\r\n"
"Host: %s\r\n" "Host: %s\r\n"
"User-Agent: WiiFlow-Lite\r\n" "User-Agent: WiiFlow-Lite\r\n"
"Connection: close\r\n" "Connection: close\r\n"
"%s" "%s"
"Pragma: no-cache\r\n" "Pragma: no-cache\r\n"
"Cache-Control: no-cache\r\n\r\n", "Cache-Control: no-cache\r\n\r\n",
path, host, isgecko); path, host, isgecko);
if ((ret = https_write(&httpinfo, request, len, false)) != len) if ((ret = https_write(&httpinfo, request, len, false)) != len)
{ {
#ifdef DEBUG_NETWORK #ifdef DEBUG_NETWORK

12
source/network/proxysettings.cpp
View File

@ -20,15 +20,15 @@ void getProxyInfo()
int fd = ISFS_Open("/shared2/sys/net/02/config.dat", ISFS_OPEN_READ); int fd = ISFS_Open("/shared2/sys/net/02/config.dat", ISFS_OPEN_READ);
if (fd >= 0) if (fd >= 0)
{ {
fstats stats ATTRIBUTE_ALIGN(32) = {}; fstats stats ATTRIBUTE_ALIGN(32);
if(ISFS_GetFileStats(fd, &stats) >= 0) if(ISFS_GetFileStats(fd, &stats) >= 0)
{ {
if (stats.file_length > 0) if (stats.file_length > 0)
{ {
buffer = (char*)MEM2_alloc(ALIGN32(stats.file_length)); buffer = (char *)MEM2_alloc(ALIGN32(stats.file_length));
if (buffer) if (buffer)
{ {
if(ISFS_Read(fd, buffer, stats.file_length) == 7004) if (ISFS_Read(fd, buffer, stats.file_length) == 7004)
{ {
proxy_enabled = buffer[44]; proxy_enabled = buffer[44];
strncpy(proxy_address, buffer + 48, sizeof(proxy_address) - 1); strncpy(proxy_address, buffer + 48, sizeof(proxy_address) - 1);
@ -44,7 +44,7 @@ void getProxyInfo()
} }
} }
char* getProxyAddress() char *getProxyAddress()
{ {
if (mainMenu.proxyUseSystem) if (mainMenu.proxyUseSystem)
return proxy_enabled ? proxy_address : NULL; return proxy_enabled ? proxy_address : NULL;
@ -58,14 +58,14 @@ u16 getProxyPort()
return mainMenu.proxyPort; return mainMenu.proxyPort;
} }
char* getProxyUsername() char *getProxyUsername()
{ {
if (mainMenu.proxyUseSystem) if (mainMenu.proxyUseSystem)
return proxy_enabled ? proxy_username : NULL; return proxy_enabled ? proxy_username : NULL;
return (strlen(mainMenu.proxyUsername) > 0) ? mainMenu.proxyUsername : NULL; return (strlen(mainMenu.proxyUsername) > 0) ? mainMenu.proxyUsername : NULL;
} }
char* getProxyPassword() char *getProxyPassword()
{ {
if (mainMenu.proxyUseSystem) if (mainMenu.proxyUseSystem)
return proxy_enabled ? proxy_password : NULL; return proxy_enabled ? proxy_password : NULL;