github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-14 18:57:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify RPCrypt

Browse source
This commit is contained in:
Florian Märkl 2018-11-17 18:57:47 +01:00
commit 640889eea3
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
4 changed files with 29 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/include/chiaki/rpcrypt.h
View file

@ -40,8 +40,8 @@ CHIAKI_EXPORT void chiaki_rpcrypt_bright_ambassador(uint8_t *bright, uint8_t *am
CHIAKI_EXPORT void chiaki_rpcrypt_init(ChiakiRPCrypt *rpcrypt, const uint8_t *nonce, const uint8_t *morning);
CHIAKI_EXPORT ChiakiErrorCode chiaki_rpcrypt_generate_iv(ChiakiRPCrypt *rpcrypt, uint8_t *iv, uint64_t counter);
CHIAKI_EXPORT ChiakiErrorCode chiaki_rpcrypt_encrypt(ChiakiRPCrypt *rpcrypt, uint64_t counter, uint8_t *buf, size_t buf_size);
CHIAKI_EXPORT ChiakiErrorCode chiaki_rpcrypt_decrypt(ChiakiRPCrypt *rpcrypt, uint64_t counter, uint8_t *buf, size_t buf_size);
CHIAKI_EXPORT ChiakiErrorCode chiaki_rpcrypt_encrypt(ChiakiRPCrypt *rpcrypt, uint64_t counter, uint8_t *in, uint8_t *out, size_t sz);
CHIAKI_EXPORT ChiakiErrorCode chiaki_rpcrypt_decrypt(ChiakiRPCrypt *rpcrypt, uint64_t counter, uint8_t *in, uint8_t *out, size_t sz);
#ifdef __cplusplus
}

8
lib/src/ctrl.c
View file

@ -21,6 +21,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <stdio.h>
#define SESSION_CTRL_PORT 9295
@ -78,13 +79,14 @@ static ChiakiErrorCode ctrl_thread_connect(ChiakiCtrl *ctrl)
CHIAKI_LOGI(&session->log, "Connected to %s:%d\n", session->connect_info.hostname, SESSION_CTRL_PORT);
char request[512];
static const char request_fmt[] =
"GET /sce/rp/session/ctrl HTTP/1.1\r\n"
"Host: %s:%d\r\n"
"User-Agent: remoteplay Windows\r\n"
"Connection: keep-alive\r\n"
"Content-Length: 0\r\n"
"RP-Auth: %s\r\n"
"RP-Auth: %s\r\n"
"RP-Version: 8.0\r\n"
"RP-Did: %s\r\n"
"RP-ControllerType: 3\r\n"
@ -92,6 +94,10 @@ static ChiakiErrorCode ctrl_thread_connect(ChiakiCtrl *ctrl)
"RP-OSType: %s\r\n"
"RP-ConPath: 1\r\n\r\n";
uint8_t auth_enc[CHIAKI_KEY_BYTES];
close(sock);
return CHIAKI_ERR_SUCCESS;
}

52
lib/src/rpcrypt.c
View file

@ -82,7 +82,7 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_rpcrypt_generate_iv(ChiakiRPCrypt *rpcrypt,
return CHIAKI_ERR_SUCCESS;
}
static ChiakiErrorCode chiaki_rpcrypt_crypt(ChiakiRPCrypt *rpcrypt, uint64_t counter, uint8_t *buf, size_t buf_size, bool encrypt)
static ChiakiErrorCode chiaki_rpcrypt_crypt(ChiakiRPCrypt *rpcrypt, uint64_t counter, uint8_t *in, uint8_t *out, size_t sz, bool encrypt)
{
EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
if(!ctx)
@ -109,60 +109,32 @@ static ChiakiErrorCode chiaki_rpcrypt_crypt(ChiakiRPCrypt *rpcrypt, uint64_t cou
if(!EVP_CIPHER_CTX_set_padding(ctx, 0))
FAIL(CHIAKI_ERR_UNKNOWN);
if(buf_size % CHIAKI_KEY_BYTES)
int outl;
if(encrypt)
{
size_t padded_size = ((buf_size + CHIAKI_KEY_BYTES - 1) / CHIAKI_KEY_BYTES) * CHIAKI_KEY_BYTES;
uint8_t *tmp = malloc(padded_size);
if(!tmp)
FAIL(CHIAKI_ERR_MEMORY);
memcpy(tmp, buf, buf_size);
memset(tmp + buf_size, 0, padded_size - buf_size);
int outl = (int)padded_size;
int success;
if(encrypt)
success = EVP_EncryptUpdate(ctx, tmp, &outl, tmp, outl);
else
success = EVP_DecryptUpdate(ctx, tmp, &outl, tmp, outl);
if(!success || outl != (int)padded_size)
{
free(tmp);
if(!EVP_EncryptUpdate(ctx, out, &outl, in, (int)sz))
FAIL(CHIAKI_ERR_UNKNOWN);
}
memcpy(buf, tmp, buf_size);
free(tmp);
}
else
{
int outl = (int)buf_size;
if(encrypt)
{
if(!EVP_EncryptUpdate(ctx, buf, &outl, buf, outl))
FAIL(CHIAKI_ERR_UNKNOWN);
}
else
{
if(!EVP_DecryptUpdate(ctx, buf, &outl, buf, outl))
FAIL(CHIAKI_ERR_UNKNOWN);
}
if(outl != (int)buf_size)
if(!EVP_DecryptUpdate(ctx, out, &outl, in, (int)sz))
FAIL(CHIAKI_ERR_UNKNOWN);
}
if(outl != (int)sz)
FAIL(CHIAKI_ERR_UNKNOWN);
#undef FAIL
EVP_CIPHER_CTX_free(ctx);
return CHIAKI_ERR_SUCCESS;
}
CHIAKI_EXPORT ChiakiErrorCode chiaki_rpcrypt_encrypt(ChiakiRPCrypt *rpcrypt, uint64_t counter, uint8_t *buf, size_t buf_size)
CHIAKI_EXPORT ChiakiErrorCode chiaki_rpcrypt_encrypt(ChiakiRPCrypt *rpcrypt, uint64_t counter, uint8_t *in, uint8_t *out, size_t sz)
{
return chiaki_rpcrypt_crypt(rpcrypt, counter, buf, buf_size, true);
return chiaki_rpcrypt_crypt(rpcrypt, counter, in, out, sz, true);
}
CHIAKI_EXPORT ChiakiErrorCode chiaki_rpcrypt_decrypt(ChiakiRPCrypt *rpcrypt, uint64_t counter, uint8_t *buf, size_t buf_size)
CHIAKI_EXPORT ChiakiErrorCode chiaki_rpcrypt_decrypt(ChiakiRPCrypt *rpcrypt, uint64_t counter, uint8_t *in, uint8_t *out, size_t sz)
{
return chiaki_rpcrypt_crypt(rpcrypt, counter, buf, buf_size, false);
return chiaki_rpcrypt_crypt(rpcrypt, counter, in, out, sz, false);
}