Commit b6981744 authored by Emilia Kasper's avatar Emilia Kasper
Browse files

constify PACKET 



PACKET contents should be read-only. To achieve this, also
- constify two user callbacks
- constify BUF_reverse.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 0c787647

CHANGES

+6 −0
Original line number Diff line number Diff line
@@ -4,6 +4,12 @@ 


 Changes between 1.0.2f and 1.1.0  [xx XXX xxxx]



  *) The signature of the session callback configured with

     SSL_CTX_sess_set_get_cb was changed. The read-only input buffer

     was explicitly marked as 'const unsigned char*' instead of

     'unsigned char*'.

     [Emilia Käsper]



  *) Always DPURIFY. Remove the use of uninitialized memory in the

     RNG, and other conditional uses of DPURIFY. This makes -DPURIFY a no-op.

     [Emilia Käsper]

apps/s_apps.h

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ long bio_dump_callback(BIO *bio, int cmd, const char *argp, 
void apps_ssl_info_callback(const SSL *s, int where, int ret);

void msg_cb(int write_p, int version, int content_type, const void *buf,

            size_t len, SSL *ssl, void *arg);

void tlsext_cb(SSL *s, int client_server, int type, unsigned char *data,

void tlsext_cb(SSL *s, int client_server, int type, const unsigned char *data,

               int len, void *arg);

#endif

apps/s_cb.c

+2 −2
Original line number Diff line number Diff line
@@ -722,14 +722,14 @@ static STRINT_PAIR tlsext_types[] = { 
};



void tlsext_cb(SSL *s, int client_server, int type,

               unsigned char *data, int len, void *arg)

               const unsigned char *data, int len, void *arg)

{

    BIO *bio = arg;

    const char *extname = lookup(type, tlsext_types, "unknown");



    BIO_printf(bio, "TLS %s extension \"%s\" (id=%d), len=%d\n",

               client_server ? "server" : "client", extname, type, len);

    BIO_dump(bio, (char *)data, len);

    BIO_dump(bio, (const char *)data, len);

    (void)BIO_flush(bio);

}

apps/s_server.c

+1 −1
Original line number Diff line number Diff line
@@ -3216,7 +3216,7 @@ static int add_session(SSL *ssl, SSL_SESSION *session) 
    return 0;

}



static SSL_SESSION *get_session(SSL *ssl, unsigned char *id, int idlen,

static SSL_SESSION *get_session(SSL *ssl, const unsigned char *id, int idlen,

                                int *do_copy)

{

    simple_ssl_session *sess;

crypto/buffer/buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ size_t BUF_MEM_grow_clean(BUF_MEM *str, size_t len) 
    return (len);

}



void BUF_reverse(unsigned char *out, unsigned char *in, size_t size)

void BUF_reverse(unsigned char *out, const unsigned char *in, size_t size)

{

    size_t i;

    if (in) {