ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1461 from phire/net_ssl_string_cleanup 

Wii Net SSL: Use std::string for hostname.
This commit is contained in:
Matthew Parlane 2014-11-01 23:43:19 +13:00
parent 86c100c442 47d8fc3aed
commit 893c36eebe
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
View File

@ -36,7 +36,7 @@ CWII_IPC_HLE_Device_net_ssl::~CWII_IPC_HLE_Device_net_ssl()
memset(&ssl.ctx, 0, sizeof(ssl_context)); memset(&ssl.ctx, 0, sizeof(ssl_context));
memset(&ssl.session, 0, sizeof(ssl_session)); memset(&ssl.session, 0, sizeof(ssl_session));
memset(&ssl.entropy, 0, sizeof(entropy_context)); memset(&ssl.entropy, 0, sizeof(entropy_context));
memset(ssl.hostname, 0, NET_SSL_MAX_HOSTNAME_LEN); ssl.hostname.clear();
ssl.active = false; ssl.active = false;
} }
@ -176,9 +176,8 @@ bool CWII_IPC_HLE_Device_net_ssl::IOCtlV(u32 _CommandAddress)
ssl_set_authmode(&ssl->ctx, SSL_VERIFY_NONE); ssl_set_authmode(&ssl->ctx, SSL_VERIFY_NONE);
ssl_set_renegotiation(&ssl->ctx, SSL_RENEGOTIATION_ENABLED); ssl_set_renegotiation(&ssl->ctx, SSL_RENEGOTIATION_ENABLED);
memcpy(ssl->hostname, hostname.c_str(), std::min((int)BufferOutSize2, NET_SSL_MAX_HOSTNAME_LEN)); ssl->hostname = hostname;
ssl->hostname[NET_SSL_MAX_HOSTNAME_LEN-1] = '\0'; ssl_set_hostname(&ssl->ctx, ssl->hostname.c_str());
ssl_set_hostname(&ssl->ctx, ssl->hostname);
ssl->active = true; ssl->active = true;
Memory::Write_U32(freeSSL, _BufferIn); Memory::Write_U32(freeSSL, _BufferIn);
@ -217,7 +216,7 @@ _SSL_NEW_ERROR:
memset(&ssl->ctx, 0, sizeof(ssl_context)); memset(&ssl->ctx, 0, sizeof(ssl_context));
memset(&ssl->session, 0, sizeof(ssl_session)); memset(&ssl->session, 0, sizeof(ssl_session));
memset(&ssl->entropy, 0, sizeof(entropy_context)); memset(&ssl->entropy, 0, sizeof(entropy_context));
memset(ssl->hostname, 0, NET_SSL_MAX_HOSTNAME_LEN); ssl->hostname.clear();
ssl->active = false; ssl->active = false;
@ -262,7 +261,7 @@ _SSL_NEW_ERROR:
} }
else else
{ {
ssl_set_ca_chain(&ssl->ctx, &ssl->cacert, nullptr, ssl->hostname); ssl_set_ca_chain(&ssl->ctx, &ssl->cacert, nullptr, ssl->hostname.c_str());
Memory::Write_U32(SSL_OK, _BufferIn); Memory::Write_U32(SSL_OK, _BufferIn);
} }
@ -359,7 +358,7 @@ _SSL_NEW_ERROR:
} }
else else
{ {
ssl_set_ca_chain(&ssl->ctx, &ssl->cacert, nullptr, ssl->hostname); ssl_set_ca_chain(&ssl->ctx, &ssl->cacert, nullptr, ssl->hostname.c_str());
Memory::Write_U32(SSL_OK, _BufferIn); Memory::Write_U32(SSL_OK, _BufferIn);
} }
INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETBUILTINROOTCA = %d", ret); INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETBUILTINROOTCA = %d", ret);

3
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
View File

@ -11,7 +11,6 @@
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
#define NET_SSL_MAX_HOSTNAME_LEN 256
#define NET_SSL_MAXINSTANCES 4 #define NET_SSL_MAXINSTANCES 4
#define SSLID_VALID(x) (x >= 0 && x < NET_SSL_MAXINSTANCES && CWII_IPC_HLE_Device_net_ssl::_SSL[x].active) #define SSLID_VALID(x) (x >= 0 && x < NET_SSL_MAXINSTANCES && CWII_IPC_HLE_Device_net_ssl::_SSL[x].active)
@ -64,7 +63,7 @@ struct WII_SSL
x509_crt clicert; x509_crt clicert;
pk_context pk; pk_context pk;
int sockfd; int sockfd;
char hostname[NET_SSL_MAX_HOSTNAME_LEN]; std::string hostname;
bool active; bool active;
}; };