Commit 2e5ead83 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Constify ssl_cert_type() 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 5ebd2fcb

ssl/ssl_locl.h

+1 −1
Original line number Diff line number Diff line
@@ -1858,7 +1858,7 @@ __owur CERT_PKEY *ssl_get_server_send_pkey(SSL *s); 
__owur int ssl_get_server_cert_serverinfo(SSL *s, const unsigned char **serverinfo,

                                   size_t *serverinfo_length);

__owur EVP_PKEY *ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *c, const EVP_MD **pmd);

__owur int ssl_cert_type(X509 *x, const EVP_PKEY *pkey);

__owur int ssl_cert_type(const X509 *x, const EVP_PKEY *pkey);

void ssl_set_masks(SSL *s);

__owur STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s);

__owur int ssl_verify_alarm_type(long type);

ssl/statem/statem_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ int tls_get_message_body(SSL *s, unsigned long *len) 
    return 1;

}



int ssl_cert_type(X509 *x, const EVP_PKEY *pk)

int ssl_cert_type(const X509 *x, const EVP_PKEY *pk)

{

    if (pk == NULL &&

        (pk = X509_get0_pubkey(x)) == NULL)