Commit 19c708d7 authored by Patrick Schlangen's avatar Patrick Schlangen Committed by Rich Salz
Browse files

Make data argument const in SSL_dane_tlsa_add 



The data argument of SSL_dane_tlsa_add is used read-only, so it
should be const.

Reviewed-by: default avatarViktor Dukhovni <viktor@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5056)

(cherry picked from commit a41a6120)
parent 32859f60

doc/ssl/SSL_CTX_dane_enable.pod

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ TLSA records that apply to the remote TLS peer. 
The arguments specify the fields of the TLSA record.

The B<data> field is provided in binary (wire RDATA) form, not the hexadecimal

ASCII presentation form, with an explicit length passed via B<dlen>.

The library takes a copy of the B<data> buffer contents and the caller may

free the original B<data> buffer when convenient.

A return value of 0 indicates that "unusable" TLSA records (with invalid or

unsupported parameters) were provided.

A negative return value indicates an internal error in processing the record.

include/openssl/ssl.h

+1 −1
Original line number Diff line number Diff line
@@ -1529,7 +1529,7 @@ __owur int SSL_CTX_dane_mtype_set(SSL_CTX *ctx, const EVP_MD *md, 
                                  uint8_t mtype, uint8_t ord);

__owur int SSL_dane_enable(SSL *s, const char *basedomain);

__owur int SSL_dane_tlsa_add(SSL *s, uint8_t usage, uint8_t selector,

                             uint8_t mtype, unsigned char *data, size_t dlen);

                             uint8_t mtype, unsigned const char *data, size_t dlen);

__owur int SSL_get0_dane_authority(SSL *s, X509 **mcert, EVP_PKEY **mspki);

__owur int SSL_get0_dane_tlsa(SSL *s, uint8_t *usage, uint8_t *selector,

                              uint8_t *mtype, unsigned const char **data,

ssl/ssl_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static const EVP_MD *tlsa_md_get(SSL_DANE *dane, uint8_t mtype) 
static int dane_tlsa_add(SSL_DANE *dane,

                         uint8_t usage,

                         uint8_t selector,

                         uint8_t mtype, unsigned char *data, size_t dlen)

                         uint8_t mtype, unsigned const char *data, size_t dlen)

{

    danetls_record *t;

    const EVP_MD *md = NULL;
@@ -1076,7 +1076,7 @@ SSL_DANE *SSL_get0_dane(SSL *s) 
}



int SSL_dane_tlsa_add(SSL *s, uint8_t usage, uint8_t selector,

                      uint8_t mtype, unsigned char *data, size_t dlen)

                      uint8_t mtype, unsigned const char *data, size_t dlen)

{

    return dane_tlsa_add(&s->dane, usage, selector, mtype, data, dlen);

}