Skip to content
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.

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

MyProxy: change private key cipher to EVP_aes_256_cbc() #230

Merged
merged 1 commit into from
Jul 22, 2024
Merged
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
10 changes: 6 additions & 4 deletions myproxy/source/ssl_utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
#define EVP_PKEY_id(k) (k)->type
#endif

#ifndef MYPROXY_PRIVKEY_CIPHER
#define MYPROXY_PRIVKEY_CIPHER() EVP_aes_256_cbc()
#endif

/**********************************************************************
*
* Constants
Expand Down Expand Up @@ -808,8 +812,7 @@ ssl_private_key_store_to_file(SSL_CREDENTIALS *creds,
else
{
/* Encrypt with pass phrase */
/* XXX This is my best guess at a cipher */
cipher = EVP_des_ede3_cbc();
cipher = MYPROXY_PRIVKEY_CIPHER();
pass_phrase_len = strlen(pass_phrase);
}

Expand Down Expand Up @@ -1127,8 +1130,7 @@ ssl_proxy_to_pem(SSL_CREDENTIALS *creds,
else
{
/* Encrypt with pass phrase */
/* XXX This is my best guess at a cipher */
cipher = EVP_des_ede3_cbc();
cipher = MYPROXY_PRIVKEY_CIPHER();
pass_phrase_len = strlen(pass_phrase);
}

Expand Down
Loading