Skip to content

Commit

Permalink
Deal with deprecated functions.
Browse files Browse the repository at this point in the history 
Remove library init functions. They were deprecated in 1.1.0.
Several functions have been const returns. Prefer those.
  • Loading branch information
@tetlowgm
tetlowgm committed Jan 23, 2025
1 parent c02c0c9 commit 1811e5b
Showing 1 changed file with 14 additions and 17 deletions.
31 changes: 14 additions & 17 deletions sslscan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1977,7 +1977,7 @@ int checkCertificate(struct sslCheckOptions *options, const SSL_METHOD *sslMetho
}

// Get Certificate...
x509Cert = SSL_get_peer_certificate(ssl);
x509Cert = SSL_get1_peer_certificate(ssl);
if (x509Cert != NULL)
{
printf("\n %sSSL Certificate:%s\n", COL_BLUE, RESET);
Expand Down Expand Up @@ -2134,7 +2134,7 @@ int checkCertificate(struct sslCheckOptions *options, const SSL_METHOD *sslMetho
{
e = X509_NAME_get_entry(subj, cnindex);
d = X509_NAME_ENTRY_get_data(e);
subject = (char *) ASN1_STRING_data(d);
subject = (const char *) ASN1_STRING_get0_data(d);
printf("Subject: %s\n", subject);
printf_xml(" <subject><![CDATA[%s]]></subject>\n", subject);
}
Expand Down Expand Up @@ -2196,7 +2196,7 @@ int checkCertificate(struct sslCheckOptions *options, const SSL_METHOD *sslMetho
{
e = X509_NAME_get_entry(subj, cnindex);
d = X509_NAME_ENTRY_get_data(e);
issuer = (char *) ASN1_STRING_data(d);
issuer = (const char *) ASN1_STRING_get0_data(d);

// If issuer is same as hostname we scanned or is *, flag as self-signed
if (
Expand Down Expand Up @@ -2225,7 +2225,7 @@ int checkCertificate(struct sslCheckOptions *options, const SSL_METHOD *sslMetho
ptime = NULL;

printf("\nNot valid before: ");
timediff = X509_cmp_time(X509_get_notBefore(x509Cert), ptime);
timediff = X509_cmp_time(X509_get0_notBefore(x509Cert), ptime);
// Certificate isn't valid yet
if (timediff > 0)
{
Expand All @@ -2235,12 +2235,12 @@ int checkCertificate(struct sslCheckOptions *options, const SSL_METHOD *sslMetho
{
printf("%s", COL_GREEN);
}
ASN1_TIME_print(stdoutBIO, X509_get_notBefore(x509Cert));
ASN1_TIME_print(stdoutBIO, X509_get0_notBefore(x509Cert));
printf("%s", RESET);

if (options->xmlOutput) {
printf_xml(" <not-valid-before>");
ASN1_TIME_print(fileBIO, X509_get_notBefore(x509Cert));
ASN1_TIME_print(fileBIO, X509_get0_notBefore(x509Cert));
printf_xml("</not-valid-before>\n");
if (timediff > 0)
{
Expand All @@ -2253,7 +2253,7 @@ int checkCertificate(struct sslCheckOptions *options, const SSL_METHOD *sslMetho
}

printf("\nNot valid after: ");
timediff = X509_cmp_time(X509_get_notAfter(x509Cert), ptime);
timediff = X509_cmp_time(X509_get0_notAfter(x509Cert), ptime);
// Certificate has expired
if (timediff < 0)
{
Expand All @@ -2263,11 +2263,11 @@ int checkCertificate(struct sslCheckOptions *options, const SSL_METHOD *sslMetho
{
printf("%s", COL_GREEN);
}
ASN1_TIME_print(stdoutBIO, X509_get_notAfter(x509Cert));
ASN1_TIME_print(stdoutBIO, X509_get0_notAfter(x509Cert));
printf("%s", RESET);
if (options->xmlOutput) {
printf_xml(" <not-valid-after>");
ASN1_TIME_print(fileBIO, X509_get_notAfter(x509Cert));
ASN1_TIME_print(fileBIO, X509_get0_notAfter(x509Cert));
printf_xml("</not-valid-after>\n");
if (timediff < 0)
{
Expand Down Expand Up @@ -2738,7 +2738,7 @@ int showCertificate(struct sslCheckOptions *options)
}
else
{
X509 *peerCertificate = SSL_get_peer_certificate(ssl);
X509 *peerCertificate = SSL_get1_peer_certificate(ssl);
certificatesChain = sk_X509_new_null();
sk_X509_push(certificatesChain, peerCertificate);
}
Expand Down Expand Up @@ -2876,20 +2876,20 @@ int showCertificate(struct sslCheckOptions *options)
if (!(X509_FLAG_COMPAT & X509_FLAG_NO_VALIDITY))
{
printf(" Not valid before: ");
ASN1_TIME_print(stdoutBIO, X509_get_notBefore(x509Cert));
ASN1_TIME_print(stdoutBIO, X509_get0_notBefore(x509Cert));
if (options->xmlOutput)
{
printf_xml(" <not-valid-before>");
ASN1_TIME_print(fileBIO, X509_get_notBefore(x509Cert));
ASN1_TIME_print(fileBIO, X509_get0_notBefore(x509Cert));
printf_xml("</not-valid-before>\n");
}
printf("\n Not valid after: ");
ASN1_TIME_print(stdoutBIO, X509_get_notAfter(x509Cert));
ASN1_TIME_print(stdoutBIO, X509_get0_notAfter(x509Cert));
printf("\n");
if (options->xmlOutput)
{
printf_xml(" <not-valid-after>");
ASN1_TIME_print(fileBIO, X509_get_notAfter(x509Cert));
ASN1_TIME_print(fileBIO, X509_get0_notAfter(x509Cert));
printf_xml("</not-valid-after>\n");
}
}
Expand Down Expand Up @@ -3771,7 +3771,6 @@ int main(int argc, char *argv[])
return -1;
}
#endif
SSL_library_init();

// Get program parameters
for (argLoop = 1; argLoop < argc; argLoop++)
Expand Down Expand Up @@ -4211,8 +4210,6 @@ int main(int argc, char *argv[])
printf("Version: %s%s%s\n%s\n%s\n", COL_GREEN, VERSION, RESET,
OpenSSL_version(OPENSSL_VERSION), RESET);

ERR_load_crypto_strings();

// Do the testing...
if (mode == mode_single)
{
Expand Down

0 comments on commit 1811e5b

Please sign in to comment.