Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-manifest.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

PRIVMX_ENDPOINT="v2.7.3"
PRIVMX_ENDPOINT="v2.7.4"
PSON_CPP="v1.0.7"
GMP="6.3.0"
POCO="1.10.1"
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@ int privmxDrvCrypto_md(const char* data, int datalen, const char* config, char**
int privmxDrvCrypto_hmac(const char* key, unsigned int keylen, const char* data, int datalen, const char* config, char** out, unsigned int* outlen);
int privmxDrvCrypto_aesEncrypt(const char* key, const char* iv, const char* data, unsigned int datalen, const char* config, char** out, unsigned int* outlen);
int privmxDrvCrypto_aesDecrypt(const char* key, const char* iv, const char* data, unsigned int datalen, const char* config, char** out, unsigned int* outlen);
int privmxDrvCrypto_aeadEncrypt(
const char* key,const char* iv, const char* aad, unsigned int aadlen, const char* data, unsigned int datalen, const char* config,
char** out, unsigned int* outlen, char** tag, unsigned int* taglen
);
int privmxDrvCrypto_aeadDecrypt(
const char* key, const char* iv, const char* aad, unsigned int aadlen, const char* data, unsigned int datalen, const char* tag, unsigned int taglen,
const char* config, char** out, unsigned int* outlen
);
int privmxDrvCrypto_pbkdf2(const char* pass, unsigned int passlen, const char* salt, unsigned int saltlen, int rounds, unsigned int length, const char* hash, char** out, unsigned int* outlen);
int privmxDrvCrypto_freeMem(void* ptr);

Expand Down
26 changes: 26 additions & 0 deletions drivers/privmx-webendpoint-drv-crypto/src/crypto.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,19 @@ int privmxDrvCrypto_aesEncrypt(const char* key, const char* iv, const char* data
}
}

int privmxDrvCrypto_aeadEncrypt(
const char* key,
const char* iv,
const char* aad, unsigned int aadlen,
const char* data, unsigned int datalen,
const char* config,
char** out, unsigned int* outlen,
char** tag, unsigned int* taglen
) {
// not supported
return 1;
}

int privmxDrvCrypto_aesDecrypt(const char* key, const char* iv, const char* data, unsigned int datalen,
const char* config, char** out, unsigned int* outlen) {
std::string str_config = translateAESConfig(config);
Expand Down Expand Up @@ -215,6 +228,19 @@ int privmxDrvCrypto_aesDecrypt(const char* key, const char* iv, const char* data
}
}

int privmxDrvCrypto_aeadDecrypt(
const char* key,
const char* iv,
const char* aad, unsigned int aadlen,
const char* data, unsigned int datalen,
const char* tag, unsigned int taglen,
const char* config,
char** out, unsigned int* outlen
) {
// not supported
return 1;
}

int privmxDrvCrypto_pbkdf2(const char* pass, unsigned int passlen, const char* salt, unsigned int saltlen, int rounds, unsigned int length, const char* hash, char** out, unsigned int* outlen){
auto future = AsyncEngine::getInstance()->callJsAsync([=](int callId) {
val params = val::object();
Expand Down
69 changes: 36 additions & 33 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@simplito/privmx-webendpoint",
"version": "2.7.3",
"version": "2.7.4",
"description": "PrivMX Web Endpoint library",
"author": "Simplito",
"license": "PrivMX Free License",
Expand Down
Loading