Skip to content

Use EVP API instead of MD5_Init/Update/Final (secure_link plugin) #7355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maskit merged 3 commits into from
Dec 4, 2020
Merged

Use EVP API instead of MD5_Init/Update/Final (secure_link plugin) #7355

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
479c20e
Use EVP API instead of MD5_Init/Update/Final
maskit Nov 30, 2020
54dc589
Use EVP_MD_CTX_create instead if EVP_MD_CTX_new is not available
maskit Nov 30, 2020
9cf6e27
Destroy MD conntext
maskit Nov 30, 2020
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
28 changes: 20 additions & 8 deletions example/plugins/c-api/secure_link/secure_link.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <openssl/md5.h>
#include <openssl/md5.h> // For MD5_DIGEST_LENGTH
#include <openssl/evp.h>

#include "ts/ts.h"
#include "ts/remap.h"
Expand All @@ -45,7 +46,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
{
int i, len;
time_t t, e;
MD5_CTX ctx;
EVP_MD_CTX *ctx;
struct sockaddr_in *in;
const char *qh, *ph, *ip;
unsigned char md[MD5_DIGEST_LENGTH];
Expand Down Expand Up @@ -102,16 +103,27 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
/* this is just example, so set fake params to prevent plugin crash */
path = TSstrdup("example/");
}
MD5_Init(&ctx);
MD5_Update(&ctx, sli->secret, strlen(sli->secret));
MD5_Update(&ctx, ip, strlen(ip));
#ifdef HAVE_EVP_MD_CTX_NEW
ctx = EVP_MD_CTX_new();
#else
ctx = EVP_MD_CTX_create();
#endif
EVP_DigestInit_ex(ctx, EVP_md5(), NULL);
EVP_DigestUpdate(ctx, sli->secret, strlen(sli->secret));
EVP_DigestUpdate(ctx, ip, strlen(ip));

if (path) {
MD5_Update(&ctx, path, strlen(path));
EVP_DigestUpdate(ctx, path, strlen(path));
}
if (expire) {
MD5_Update(&ctx, expire, strlen(expire));
EVP_DigestUpdate(ctx, expire, strlen(expire));
}
MD5_Final(md, &ctx);
EVP_DigestFinal_ex(ctx, md, NULL);
#ifdef HAVE_EVP_MD_CTX_FREE
EVP_MD_CTX_free(ctx);
#else
EVP_MD_CTX_destroy(ctx);
#endif
for (i = 0; i < MD5_DIGEST_LENGTH; i++) {
sprintf(&hash[i * 2], "%02x", md[i]);
}
Expand Down