DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

EST: Write the RSA private key using the standard PRIVATE KEY format

Browse source 
The routines used for using raw RSA keys directly have been deprecated
in OpenSSL 3.0. There should be no particular need to use the "RSA
PRIVATE KEY" format, so replace this with the more common "PRIVATE KEY"
format that can be written without use of the deprecated functions.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2023-02-23 16:44:38 +02:00 • committed by Jouni Malinen
parent bfd236df21
commit e2ea0fd70b
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hs20/client/est.c
View file

@ -11,7 +11,6 @@
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/pkcs7.h> #include <openssl/pkcs7.h>
#include <openssl/rsa.h>
#include <openssl/asn1.h> #include <openssl/asn1.h>
#include <openssl/asn1t.h> #include <openssl/asn1t.h>
#include <openssl/x509.h> #include <openssl/x509.h>
@ -367,7 +366,6 @@ static int generate_csr(struct hs20_osu_client *ctx, char *key_pem,
{ {
EVP_PKEY_CTX *pctx = NULL; EVP_PKEY_CTX *pctx = NULL;
EVP_PKEY *pkey = NULL; EVP_PKEY *pkey = NULL;
RSA *rsa;
X509_REQ *req = NULL; X509_REQ *req = NULL;
int ret = -1; int ret = -1;
unsigned int val; unsigned int val;
@ -395,16 +393,11 @@ static int generate_csr(struct hs20_osu_client *ctx, char *key_pem,
EVP_PKEY_CTX_free(pctx); EVP_PKEY_CTX_free(pctx);
pctx = NULL; pctx = NULL;
rsa = EVP_PKEY_get1_RSA(pkey);
if (rsa == NULL)
goto fail;
if (key_pem) { if (key_pem) {
FILE *f = fopen(key_pem, "wb"); FILE *f = fopen(key_pem, "wb");
if (f == NULL) if (f == NULL)
goto fail; goto fail;
if (!PEM_write_RSAPrivateKey(f, rsa, NULL, NULL, 0, NULL, if (!PEM_write_PrivateKey(f, pkey, NULL, NULL, 0, NULL, NULL)) {
NULL)) {
wpa_printf(MSG_INFO, "Could not write private key: %s", wpa_printf(MSG_INFO, "Could not write private key: %s",
ERR_error_string(ERR_get_error(), NULL)); ERR_error_string(ERR_get_error(), NULL));
fclose(f); fclose(f);