mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected the compatibility function names: crypto_cert_subject_alt_name and crypto_cert_subject_alt_name_free.

Browse Source
This commit is contained in:
Pascal J. Bourguignon 2018-08-27 13:51:30 +02:00
parent 53692ffc57
commit 63d00f6f81
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/freerdp/crypto/crypto.h
View File

@ -65,13 +65,14 @@ FREERDP_API void crypto_cert_print_info(X509* xcert);
FREERDP_API void crypto_cert_free(CryptoCert cert);
/*
Deprecated function names; use crypto_cert_get_dns_names and crypto_cert_dns_names_free instead.
Kept for now for compatibility of FREERDP_API;
Note: email and upn amongst others are also alt_names;
Deprecated function names: crypto_cert_subject_alt_name and crypto_cert_subject_alt_name_free.
Use crypto_cert_get_dns_names and crypto_cert_dns_names_free instead.
(old names kept for now for compatibility of FREERDP_API).
Note: email and upn amongst others are also alt_names,
but the old crypto_cert_get_alt_names returned only the dns_names
*/
FREERDP_API char** crypto_cert_get_alt_names(X509* xcert, int* count, int** lengths);
FREERDP_API void crypto_cert_alt_names_free(int count, int* lengths, char** alt_names);
FREERDP_API char** crypto_cert_subject_alt_name(X509* xcert, int* count, int** lengths);
FREERDP_API void crypto_cert_subject_alt_name_free(int count, int *lengths, char** alt_names);
FREERDP_API BOOL x509_verify_certificate(CryptoCert cert, char* certificate_store_path);
FREERDP_API rdpCertificateData* crypto_get_certificate_data(X509* xcert, char* hostname,

9
libfreerdp/crypto/crypto.c
View File

@ -674,7 +674,9 @@ char* crypto_cert_get_upn(X509* x509)
return result;
}
void crypto_cert_alt_names_free(int count, int* lengths, char** alt_names)
/* Deprecated name.*/
void crypto_cert_subject_alt_name_free(int count, int *lengths, char** alt_names)
{
crypto_cert_dns_names_free(count, lengths, alt_names);
}
@ -700,9 +702,10 @@ void crypto_cert_dns_names_free(int count, int* lengths,
}
}
char** crypto_cert_get_alt_names(X509* x509, int* count, int** lengths)
/* Deprecated name.*/
char** crypto_cert_subject_alt_name(X509* xcert, int* count, int** lengths)
{
return crypto_cert_get_dns_names(x509, count, lengths);
return crypto_cert_get_dns_names(xcert, count, lengths);
}
char** crypto_cert_get_dns_names(X509* x509, int* count, int** lengths)