Skip to content

Commit 6d4d62b

Browse files
kscoksco
committed
[WRAPPER] Wrapped more symbols for libnettle8 and lzma
1 parent 41bc4c5 commit 6d4d62b

File tree

8 files changed

+116
-15
lines changed

8 files changed

+116
-15
lines changed

‎src/emu/x64printer.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5023,6 +5023,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
50235023
snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9);
50245024
} else if (w == vFEppippp) {
50255025
snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9);
5026+
} else if (w == vFEpppLLp) {
5027+
snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIu64 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9);
50265028
} else if (w == vFEpppLpp) {
50275029
snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9);
50285030
} else if (w == vFEppppup) {
@@ -6455,6 +6457,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
64556457
snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24));
64566458
} else if (w == vFEpppLuLpLp) {
64576459
snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIu32 ", %" PRIu64 ", %" PRIp ", %" PRIu64 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uint32_t)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(void**)(R_RSP + 24));
6460+
} else if (w == vFEppppppLpp) {
6461+
snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uintptr_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24));
64586462
} else if (w == vFiiiiiiiiii) {
64596463
snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32));
64606464
} else if (w == vFiiiiiiiiiu) {

‎src/wrapped/generated/functions_list.txt‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2744,6 +2744,7 @@
27442744
#() vFEpuLppp
27452745
#() vFEpupppp
27462746
#() vFEppippp
2747+
#() vFEpppLLp
27472748
#() vFEpppLpp
27482749
#() vFEppppup
27492750
#() vFEppppLp
@@ -3501,6 +3502,7 @@
35013502
#() vFEpuppppppp
35023503
#() vFEpppuipppp
35033504
#() vFEpppLuLpLp
3505+
#() vFEppppppLpp
35043506
#() vFiiiiiiiiii
35053507
#() vFiiiiiiiiiu
35063508
#() vFiiiiiiiiui
@@ -5710,19 +5712,28 @@ wrappedlibnettle8:
57105712
- vFppp:
57115713
- nettle_cmac128_set_key
57125714
- nettle_cmac64_set_key
5715+
- nettle_eax_set_key
57135716
- nettle_gcm_set_key
5717+
- nettle_ocb_set_key
57145718
- vFppLp:
57155719
- nettle_hmac_update
57165720
- vFpppLp:
57175721
- nettle_cmac128_update
57185722
- nettle_cmac64_update
5723+
- vFpppLLp:
5724+
- nettle_ocb_set_nonce
57195725
- vFppppup:
57205726
- nettle_cmac128_digest
57215727
- nettle_cmac64_digest
57225728
- vFppppLp:
5729+
- nettle_eax_digest
5730+
- nettle_eax_set_nonce
5731+
- nettle_eax_update
57235732
- nettle_gcm_digest
57245733
- nettle_hmac_digest
57255734
- nettle_hmac_set_key
5735+
- nettle_ocb_digest
5736+
- nettle_ocb_update
57265737
- vFppLpLpp:
57275738
- nettle_cbc_decrypt
57285739
- nettle_cbc_encrypt
@@ -5734,12 +5745,17 @@ wrappedlibnettle8:
57345745
- vFpppLLpp:
57355746
- nettle_hkdf_extract
57365747
- vFppppLpp:
5748+
- nettle_eax_decrypt
5749+
- nettle_eax_encrypt
57375750
- nettle_gcm_decrypt
57385751
- nettle_gcm_encrypt
5752+
- nettle_ocb_encrypt
57395753
- vFpppLLpLp:
57405754
- nettle_hkdf_expand
57415755
- vFpppLuLpLp:
57425756
- nettle_pbkdf2
5757+
- vFppppppLpp:
5758+
- nettle_ocb_decrypt
57435759
- vFppLpLpLLpp:
57445760
- nettle_ccm_encrypt_message
57455761
- iFppLpLpLLpp:

‎src/wrapped/generated/wrappedlibnettle8types.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,38 @@
1414
typedef void (*vFppp_t)(void*, void*, void*);
1515
typedef void (*vFppLp_t)(void*, void*, uintptr_t, void*);
1616
typedef void (*vFpppLp_t)(void*, void*, void*, uintptr_t, void*);
17+
typedef void (*vFpppLLp_t)(void*, void*, void*, uintptr_t, uintptr_t, void*);
1718
typedef void (*vFppppup_t)(void*, void*, void*, void*, uint32_t, void*);
1819
typedef void (*vFppppLp_t)(void*, void*, void*, void*, uintptr_t, void*);
1920
typedef void (*vFppLpLpp_t)(void*, void*, uintptr_t, void*, uintptr_t, void*, void*);
2021
typedef void (*vFpppLLpp_t)(void*, void*, void*, uintptr_t, uintptr_t, void*, void*);
2122
typedef void (*vFppppLpp_t)(void*, void*, void*, void*, uintptr_t, void*, void*);
2223
typedef void (*vFpppLLpLp_t)(void*, void*, void*, uintptr_t, uintptr_t, void*, uintptr_t, void*);
2324
typedef void (*vFpppLuLpLp_t)(void*, void*, void*, uintptr_t, uint32_t, uintptr_t, void*, uintptr_t, void*);
25+
typedef void (*vFppppppLpp_t)(void*, void*, void*, void*, void*, void*, uintptr_t, void*, void*);
2426
typedef void (*vFppLpLpLLpp_t)(void*, void*, uintptr_t, void*, uintptr_t, void*, uintptr_t, uintptr_t, void*, void*);
2527
typedef int32_t (*iFppLpLpLLpp_t)(void*, void*, uintptr_t, void*, uintptr_t, void*, uintptr_t, uintptr_t, void*, void*);
2628

2729
#define SUPER() ADDED_FUNCTIONS() \
2830
GO(nettle_cmac128_set_key, vFppp_t) \
2931
GO(nettle_cmac64_set_key, vFppp_t) \
32+
GO(nettle_eax_set_key, vFppp_t) \
3033
GO(nettle_gcm_set_key, vFppp_t) \
34+
GO(nettle_ocb_set_key, vFppp_t) \
3135
GO(nettle_hmac_update, vFppLp_t) \
3236
GO(nettle_cmac128_update, vFpppLp_t) \
3337
GO(nettle_cmac64_update, vFpppLp_t) \
38+
GO(nettle_ocb_set_nonce, vFpppLLp_t) \
3439
GO(nettle_cmac128_digest, vFppppup_t) \
3540
GO(nettle_cmac64_digest, vFppppup_t) \
41+
GO(nettle_eax_digest, vFppppLp_t) \
42+
GO(nettle_eax_set_nonce, vFppppLp_t) \
43+
GO(nettle_eax_update, vFppppLp_t) \
3644
GO(nettle_gcm_digest, vFppppLp_t) \
3745
GO(nettle_hmac_digest, vFppppLp_t) \
3846
GO(nettle_hmac_set_key, vFppppLp_t) \
47+
GO(nettle_ocb_digest, vFppppLp_t) \
48+
GO(nettle_ocb_update, vFppppLp_t) \
3949
GO(nettle_cbc_decrypt, vFppLpLpp_t) \
4050
GO(nettle_cbc_encrypt, vFppLpLpp_t) \
4151
GO(nettle_cfb8_decrypt, vFppLpLpp_t) \
@@ -44,10 +54,14 @@ typedef int32_t (*iFppLpLpLLpp_t)(void*, void*, uintptr_t, void*, uintptr_t, voi
4454
GO(nettle_cfb_encrypt, vFppLpLpp_t) \
4555
GO(nettle_ctr_crypt, vFppLpLpp_t) \
4656
GO(nettle_hkdf_extract, vFpppLLpp_t) \
57+
GO(nettle_eax_decrypt, vFppppLpp_t) \
58+
GO(nettle_eax_encrypt, vFppppLpp_t) \
4759
GO(nettle_gcm_decrypt, vFppppLpp_t) \
4860
GO(nettle_gcm_encrypt, vFppppLpp_t) \
61+
GO(nettle_ocb_encrypt, vFppppLpp_t) \
4962
GO(nettle_hkdf_expand, vFpppLLpLp_t) \
5063
GO(nettle_pbkdf2, vFpppLuLpLp_t) \
64+
GO(nettle_ocb_decrypt, vFppppppLpp_t) \
5165
GO(nettle_ccm_encrypt_message, vFppLpLpLLpp_t) \
5266
GO(nettle_ccm_decrypt_message, iFppLpLpLLpp_t)
5367

‎src/wrapped/generated/wrapper.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2771,6 +2771,7 @@ typedef void (*vFEpuuipp_t)(x64emu_t*, void*, uint32_t, uint32_t, int32_t, void*
27712771
typedef void (*vFEpuLppp_t)(x64emu_t*, void*, uint32_t, uintptr_t, void*, void*, void*);
27722772
typedef void (*vFEpupppp_t)(x64emu_t*, void*, uint32_t, void*, void*, void*, void*);
27732773
typedef void (*vFEppippp_t)(x64emu_t*, void*, void*, int32_t, void*, void*, void*);
2774+
typedef void (*vFEpppLLp_t)(x64emu_t*, void*, void*, void*, uintptr_t, uintptr_t, void*);
27742775
typedef void (*vFEpppLpp_t)(x64emu_t*, void*, void*, void*, uintptr_t, void*, void*);
27752776
typedef void (*vFEppppup_t)(x64emu_t*, void*, void*, void*, void*, uint32_t, void*);
27762777
typedef void (*vFEppppLp_t)(x64emu_t*, void*, void*, void*, void*, uintptr_t, void*);
@@ -3527,6 +3528,7 @@ typedef void (*vFEiuppppppp_t)(x64emu_t*, int32_t, uint32_t, void*, void*, void*
35273528
typedef void (*vFEpuppppppp_t)(x64emu_t*, void*, uint32_t, void*, void*, void*, void*, void*, void*, void*);
35283529
typedef void (*vFEpppuipppp_t)(x64emu_t*, void*, void*, void*, uint32_t, int32_t, void*, void*, void*, void*);
35293530
typedef void (*vFEpppLuLpLp_t)(x64emu_t*, void*, void*, void*, uintptr_t, uint32_t, uintptr_t, void*, uintptr_t, void*);
3531+
typedef void (*vFEppppppLpp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, uintptr_t, void*, void*);
35303532
typedef void (*vFiiiiiiiiii_t)(int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
35313533
typedef void (*vFiiiiiiiiiu_t)(int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, uint32_t);
35323534
typedef void (*vFiiiiiiiiui_t)(int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, uint32_t, int32_t);
@@ -6699,6 +6701,7 @@ void vFEpuuipp(x64emu_t *emu, uintptr_t fcn) { vFEpuuipp_t fn = (vFEpuuipp_t)fcn
66996701
void vFEpuLppp(x64emu_t *emu, uintptr_t fcn) { vFEpuLppp_t fn = (vFEpuLppp_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
67006702
void vFEpupppp(x64emu_t *emu, uintptr_t fcn) { vFEpupppp_t fn = (vFEpupppp_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
67016703
void vFEppippp(x64emu_t *emu, uintptr_t fcn) { vFEppippp_t fn = (vFEppippp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
6704+
void vFEpppLLp(x64emu_t *emu, uintptr_t fcn) { vFEpppLLp_t fn = (vFEpppLLp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9); }
67026705
void vFEpppLpp(x64emu_t *emu, uintptr_t fcn) { vFEpppLpp_t fn = (vFEpppLpp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9); }
67036706
void vFEppppup(x64emu_t *emu, uintptr_t fcn) { vFEppppup_t fn = (vFEppppup_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
67046707
void vFEppppLp(x64emu_t *emu, uintptr_t fcn) { vFEppppLp_t fn = (vFEppppLp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9); }
@@ -7455,6 +7458,7 @@ void vFEiuppppppp(x64emu_t *emu, uintptr_t fcn) { vFEiuppppppp_t fn = (vFEiupppp
74557458
void vFEpuppppppp(x64emu_t *emu, uintptr_t fcn) { vFEpuppppppp_t fn = (vFEpuppppppp_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
74567459
void vFEpppuipppp(x64emu_t *emu, uintptr_t fcn) { vFEpppuipppp_t fn = (vFEpppuipppp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
74577460
void vFEpppLuLpLp(x64emu_t *emu, uintptr_t fcn) { vFEpppLuLpLp_t fn = (vFEpppLuLpLp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uint32_t)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
7461+
void vFEppppppLpp(x64emu_t *emu, uintptr_t fcn) { vFEppppppLpp_t fn = (vFEppppppLpp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uintptr_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
74587462
void vFiiiiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFiiiiiiiiii_t fn = (vFiiiiiiiiii_t)fcn; fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
74597463
void vFiiiiiiiiiu(x64emu_t *emu, uintptr_t fcn) { vFiiiiiiiiiu_t fn = (vFiiiiiiiiiu_t)fcn; fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32)); }
74607464
void vFiiiiiiiiui(x64emu_t *emu, uintptr_t fcn) { vFiiiiiiiiui_t fn = (vFiiiiiiiiui_t)fcn; fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }

‎src/wrapped/generated/wrapper.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2781,6 +2781,7 @@ void vFEpuuipp(x64emu_t *emu, uintptr_t fnc);
27812781
void vFEpuLppp(x64emu_t *emu, uintptr_t fnc);
27822782
void vFEpupppp(x64emu_t *emu, uintptr_t fnc);
27832783
void vFEppippp(x64emu_t *emu, uintptr_t fnc);
2784+
void vFEpppLLp(x64emu_t *emu, uintptr_t fnc);
27842785
void vFEpppLpp(x64emu_t *emu, uintptr_t fnc);
27852786
void vFEppppup(x64emu_t *emu, uintptr_t fnc);
27862787
void vFEppppLp(x64emu_t *emu, uintptr_t fnc);
@@ -3538,6 +3539,7 @@ void vFEiuppppppp(x64emu_t *emu, uintptr_t fnc);
35383539
void vFEpuppppppp(x64emu_t *emu, uintptr_t fnc);
35393540
void vFEpppuipppp(x64emu_t *emu, uintptr_t fnc);
35403541
void vFEpppLuLpLp(x64emu_t *emu, uintptr_t fnc);
3542+
void vFEppppppLpp(x64emu_t *emu, uintptr_t fnc);
35413543
void vFiiiiiiiiii(x64emu_t *emu, uintptr_t fnc);
35423544
void vFiiiiiiiiiu(x64emu_t *emu, uintptr_t fnc);
35433545
void vFiiiiiiiiui(x64emu_t *emu, uintptr_t fnc);

‎src/wrapped/wrappedlibnettle8.c‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,4 +333,65 @@ EXPORT void my_nettle_hmac_digest(x64emu_t* emu, void* outer, void* inner, void*
333333
my->nettle_hmac_digest(outer, inner, state, Wrap_nettle_hash(&save, hash), l, key);
334334
}
335335

336+
EXPORT void my_nettle_eax_decrypt(x64emu_t* emu, void* eax, void* key, void* cipher, void* f, unsigned long len, void* dst, void* src)
337+
{
338+
my->nettle_eax_decrypt(eax, key, cipher, findnettle_cipher_funcFct(f), len, dst, src);
339+
}
340+
341+
EXPORT void my_nettle_eax_digest(x64emu_t* emu, void* eax, void* key, void* cipher, void* f, unsigned long len, void* digest)
342+
{
343+
my->nettle_eax_digest(eax, key, cipher, findnettle_cipher_funcFct(f), len, digest);
344+
}
345+
346+
EXPORT void my_nettle_eax_encrypt(x64emu_t* emu, void* eax, void* key, void* cipher, void* f, unsigned long len, void* dst, void* src)
347+
{
348+
my->nettle_eax_encrypt(eax, key, cipher, findnettle_cipher_funcFct(f), len, dst, src);
349+
}
350+
351+
352+
EXPORT void my_nettle_eax_set_key(x64emu_t* emu, void* key, void* cipher, void* f)
353+
{
354+
my->nettle_eax_set_key(key, cipher, findnettle_cipher_funcFct(f));
355+
}
356+
357+
EXPORT void my_nettle_eax_set_nonce(x64emu_t* emu, void* eax, void* key, void* cipher)
358+
{
359+
360+
}
361+
362+
EXPORT void my_nettle_eax_update(x64emu_t* emu, void* eax, void* key, void* cipher, void* f, unsigned long len, void* data)
363+
{
364+
my->nettle_eax_update(eax, key, cipher, findnettle_cipher_funcFct(f), len, data);
365+
}
366+
367+
EXPORT void my_nettle_ocb_decrypt(x64emu_t* emu, void* ctx, void* key, void* encrypt_ctx, void* encrypt_f, void* decrypt_ctx, void* decrypt_f, unsigned long len, void* dst, void* src)
368+
{
369+
my->nettle_ocb_decrypt(ctx, key, encrypt_ctx, findnettle_cipher_funcFct(encrypt_f), decrypt_ctx, findnettle_cipher_funcFct(decrypt_f), len, dst, src);
370+
}
371+
372+
EXPORT void my_nettle_ocb_digest(x64emu_t* emu, void* ctx, void* key, void* cipher, void* f, unsigned long len, void* digest)
373+
{
374+
my->nettle_ocb_digest(ctx, key, cipher, findnettle_cipher_funcFct(f), len, digest);
375+
}
376+
377+
EXPORT void my_nettle_ocb_encrypt(x64emu_t* emu, void* ctx, void* key, void* cipher, void* f, unsigned long len, void* dst, void* src)
378+
{
379+
my->nettle_ocb_encrypt(ctx, key, cipher, findnettle_cipher_funcFct(f), len, dst, src);
380+
}
381+
382+
EXPORT void my_nettle_ocb_set_key(x64emu_t* emu, void* key, void* cipher, void* f)
383+
{
384+
my->nettle_ocb_set_key(key, cipher, findnettle_cipher_funcFct(f));
385+
}
386+
387+
EXPORT void my_nettle_ocb_set_nonce(x64emu_t* emu, void* ctx, void* cipher, void* f, unsigned long len1, unsigned long len2, void* nonce)
388+
{
389+
my->nettle_ocb_set_nonce(ctx, cipher, findnettle_cipher_funcFct(f), len1, len2, nonce);
390+
}
391+
392+
EXPORT void my_nettle_ocb_update(x64emu_t* emu, void* ctx, void* key, void* cipher, void* f, unsigned long len, void* data)
393+
{
394+
my->nettle_ocb_update(ctx, key, cipher, findnettle_cipher_funcFct(f), len, data);
395+
}
396+
336397
#include "wrappedlib_init.h"

‎src/wrapped/wrappedlibnettle8_private.h‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,12 @@ GO(nettle_eax_aes128_digest, vFpLp)
224224
GO(nettle_eax_aes128_set_key, vFpp)
225225
//GO(nettle_eax_aes128_set_nonce,
226226
GO(nettle_eax_aes128_update, vFpLp)
227-
//GO(nettle_eax_decrypt,
228-
//GO(nettle_eax_digest,
229-
//GO(nettle_eax_encrypt,
230-
//GO(nettle_eax_set_key,
231-
//GO(nettle_eax_set_nonce,
232-
//GO(nettle_eax_update,
227+
GOM(nettle_eax_decrypt, vFEppppLpp)
228+
GOM(nettle_eax_digest, vFEppppLp)
229+
GOM(nettle_eax_encrypt, vFEppppLpp)
230+
GOM(nettle_eax_set_key, vFEppp)
231+
GOM(nettle_eax_set_nonce, vFEppppLp)
232+
GOM(nettle_eax_update, vFEppppLp)
233233
//DATA(nettle_gcm_aes128,
234234
GO(nettle_gcm_aes128_decrypt, vFpLpp)
235235
GO(nettle_gcm_aes128_digest, vFpLp)
@@ -385,14 +385,14 @@ GO(nettle_ocb_aes128_set_decrypt_key, vFppp)
385385
GO(nettle_ocb_aes128_set_encrypt_key, vFpp)
386386
GO(nettle_ocb_aes128_set_nonce, vFppLLp)
387387
GO(nettle_ocb_aes128_update, vFppLp)
388-
//GO(nettle_ocb_decrypt,
388+
GOM(nettle_ocb_decrypt, vFEppppppLpp)
389389
//GO(nettle_ocb_decrypt_message,
390-
//GO(nettle_ocb_digest,
391-
//GO(nettle_ocb_encrypt,
390+
GOM(nettle_ocb_digest, vFEppppLp)
391+
GOM(nettle_ocb_encrypt, vFEppppLpp)
392392
//GO(nettle_ocb_encrypt_message,
393-
//GO(nettle_ocb_set_key,
394-
//GO(nettle_ocb_set_nonce,
395-
//GO(nettle_ocb_update,
393+
GOM(nettle_ocb_set_key, vFEppp)
394+
GOM(nettle_ocb_set_nonce, vFEpppLLp)
395+
GOM(nettle_ocb_update, vFEppppLp)
396396
GOM(nettle_pbkdf2, vFEpppLuLpLp)
397397
GO(nettle_pbkdf2_hmac_gosthash94cp, vFLpuLpLp)
398398
//GO(nettle_pbkdf2_hmac_sha1,
@@ -527,7 +527,7 @@ GO(nettle_streebog512_update, vFpLp)
527527
//DATA(nettle_twofish256,
528528
GO(nettle_twofish256_set_key, vFpp)
529529
GO(nettle_twofish_decrypt, vFpLpp)
530-
//GO(nettle_twofish_encrypt,
530+
GO(nettle_twofish_encrypt, vFpLpp)
531531
GO(nettle_twofish_set_key, vFpLp)
532532
GO(nettle_umac128_digest, vFpLp)
533533
GO(nettle_umac128_set_key, vFpp)

‎src/wrapped/wrappedlzma_private.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ GO(lzma_index_stream_padding, uFpL)
6868
//GO(lzma_index_total_size,
6969
GO(lzma_index_uncompressed_size, LFp)
7070
GO(lzma_lzma_preset, CFpu)
71-
//GO(lzma_memlimit_get,
72-
//GO(lzma_memlimit_set,
71+
GO(lzma_memlimit_get, UFp)
72+
GO(lzma_memlimit_set, iFpU)
7373
GO(lzma_memusage, UFp)
7474
GO(lzma_mf_is_supported, CFu)
7575
GO(lzma_mode_is_supported, CFu)

0 commit comments

Comments
 (0)