From 337960002333d4bcfc48c3a6e0d647360f2f38bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20Bing=C3=BCl?= Date: Tue, 14 Aug 2018 17:15:04 +0300 Subject: [PATCH] Edited aes encrypiton format. Co-authored-by: erdemduman Co-authored-by: mashary --- src/apps/relay/dbdrivers/dbd_mysql.c | 6 ++++++ src/apps/relay/mainrelay.c | 13 ++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/apps/relay/dbdrivers/dbd_mysql.c b/src/apps/relay/dbdrivers/dbd_mysql.c index b4b0f92..3953796 100644 --- a/src/apps/relay/dbdrivers/dbd_mysql.c +++ b/src/apps/relay/dbdrivers/dbd_mysql.c @@ -87,7 +87,13 @@ char* decryptPassword(char* in, const unsigned char* mykey){ char last[1024]=""; init_ctr(&state, iv); memset(outdata,'\0', sizeof(outdata)); + +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + CRYPTO_ctr128_encrypt(encryptedText, outdata, newTotalSize, &key, state.ivec, state.ecount, &state.num,(block128_f)AES_encrypt); +#else AES_ctr128_encrypt(encryptedText, outdata, newTotalSize, &key, state.ivec, state.ecount, &state.num); +#endif + strcat(last,(char*)outdata); out=malloc(sizeof(char)*strlen(last)); strcpy(out,last); diff --git a/src/apps/relay/mainrelay.c b/src/apps/relay/mainrelay.c index 949a96a..3fd5404 100644 --- a/src/apps/relay/mainrelay.c +++ b/src/apps/relay/mainrelay.c @@ -965,7 +965,13 @@ void encrypt(unsigned char* in, const unsigned char* mykey){ char total[256]; int size=0; init_ctr(&state, iv); + +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + CRYPTO_ctr128_encrypt(in, out, strlen((char*)in), &key, state.ivec, state.ecount, &state.num,(block128_f)AES_encrypt); +#else AES_ctr128_encrypt(in, out, strlen((char*)in), &key, state.ivec, state.ecount, &state.num); +#endif + totalSize += strlen((char*)in); size = strlen((char*)in); for (j = 0; j< size; j++) { @@ -1046,10 +1052,15 @@ void decrypt(char* in, const unsigned char* mykey){ int bytes_to_decode = strlen(in); unsigned char *encryptedText = base64decode(in, bytes_to_decode); char last[1024]=""; - int i=0; init_ctr(&state, iv); memset(outdata,'\0', sizeof(outdata)); + +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + CRYPTO_ctr128_encrypt(encryptedText,outdata,newTotalSize,&key, state.ivec, state.ecount, &state.num,(block128_f)AES_encrypt)); +#else AES_ctr128_encrypt(encryptedText, outdata, newTotalSize, &key, state.ivec, state.ecount, &state.num); +#endif + strcat(last,(char*)outdata); printf("%s\n",last); }