mirror
/
ClassiCube
mirror of https://github.com/ClassiCube/ClassiCube
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

try to fix generic BearSSL I/O error being returned instead of actual error code

This commit is contained in:
UnknownShadow200 2025-10-10 07:42:50 +11:00
parent b756f80b4a
commit 831987e4db
2 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.github/workflows/build_symbian.yml vendored
View File

@ -36,11 +36,30 @@ jobs:
(Get-Content ClassiCube.pkg).Replace('$(EPOCROOT)', "$SDK").Replace('$(PLATFORM)', 'armv5').Replace('$(TARGET)', 'urel') | Set-Content ClassiCube.pkg
cmd /c "$SDK/epoc32/tools/makesis.exe ClassiCube.pkg ClassiCube.sis"
- uses: ./.github/actions/upload_build
if: ${{ always() && steps.compile.outcome == 'success' }}
with:
SOURCE_FILE: 'misc/symbian/ClassiCube.sis'
DEST_NAME: 'ClassiCube-Symbian.sis'
- uses: ./.github/actions/upload_build
if: ${{ always() && steps.compile.outcome == 'success' }}
with:
SOURCE_FILE: '$pwd/SDK/epoc32/release/armv5/urel/ClassiCube_s60v5.exe'
DEST_NAME: 'ClassiCube_s60v3.exe'
- uses: ./.github/actions/upload_build
if: ${{ always() && steps.compile.outcome == 'success' }}
with:
SOURCE_FILE: '$pwd/SDK/epoc32/release/armv5/urel/ClassiCube_s60v3.exe'
DEST_NAME: 'ClassiCube_s60v3.exe'
- uses: ./.github/actions/upload_build
if: ${{ always() && steps.compile.outcome == 'success' }}
with:
SOURCE_FILE: '$pwd/SDK/epoc32/release/armv5/urel/ClassiCube_sym3.exe'
DEST_NAME: 'ClassiCube_sym3.exe'
- uses: ./.github/actions/notify_success

36
src/SSL.c
View File

@ -201,22 +201,24 @@ cc_result SSL_Init(cc_socket socket, const cc_string* host_, void** out_ctx) {
return 0;
}
static CC_NOINLINE cc_result SSL_GetError(SSLContext* ctx) {
int err;
if (ctx->writeError) return ctx->writeError;
if (ctx->readError) return ctx->readError;
// TODO session resumption, proper connection closing ??
err = br_ssl_engine_last_error(&ctx->sc.eng);
if (err == 0 && br_ssl_engine_current_state(&ctx->sc.eng) == BR_SSL_CLOSED)
return SSL_ERR_CONTEXT_DEAD;
return SSL_ERROR_SHIFT | (err & 0xFFFF);
}
cc_result SSL_Read(void* ctx_, cc_uint8* data, cc_uint32 count, cc_uint32* read) {
SSLContext* ctx = (SSLContext*)ctx_;
// TODO: just br_sslio_write ??
int res = br_sslio_read(&ctx->ioc, data, count);
int err;
if (res < 0) {
if (ctx->readError) return ctx->readError;
// TODO session resumption, proper connection closing ??
err = br_ssl_engine_last_error(&ctx->sc.eng);
if (err == 0 && br_ssl_engine_current_state(&ctx->sc.eng) == BR_SSL_CLOSED)
return SSL_ERR_CONTEXT_DEAD;
return SSL_ERROR_SHIFT | (err & 0xFFFF);
}
if (res < 0) return SSL_GetError(ctx);
br_sslio_flush(&ctx->ioc);
*read = res;
@ -227,15 +229,7 @@ cc_result SSL_WriteAll(void* ctx_, const cc_uint8* data, cc_uint32 count) {
SSLContext* ctx = (SSLContext*)ctx_;
// TODO: just br_sslio_write ??
int res = br_sslio_write_all(&ctx->ioc, data, count);
if (res < 0) {
if (ctx->writeError) {
return ctx->writeError;
} else {
int err = br_ssl_engine_last_error(&ctx->sc.eng);
return SSL_ERROR_SHIFT | (err & 0xFFFF);
}
}
if (res < 0) return SSL_GetError(ctx);
br_sslio_flush(&ctx->ioc);
return 0;