[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  9bfeeef8ee2220339e601a028fa991c30d296ed4 (commit)
       via  6944311688015ad293bd788ce78f3226738ebf00 (commit)
      from  fb34a0f4e033246ef5f957bc57d2ebc904a519fc (commit)


- Log -----------------------------------------------------------------
commit 9bfeeef8ee2220339e601a028fa991c30d296ed4
Author: Matt Caswell <matt at openssl.org>
Date:   Tue May 2 11:08:33 2017 +0100

    Fix ASN1_TIME_to_generalizedtime to take a const ASN1_TIME
    
    Fixes #1526
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3360)

commit 6944311688015ad293bd788ce78f3226738ebf00
Author: Matt Caswell <matt at openssl.org>
Date:   Tue May 2 11:00:50 2017 +0100

    Make SSL_is_server() accept a const SSL
    
    Fixes #1526
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3360)

-----------------------------------------------------------------------

Summary of changes:
 crypto/asn1/a_time.c   | 2 +-
 include/openssl/asn1.h | 4 ++--
 include/openssl/ssl.h  | 2 +-
 ssl/ssl_lib.c          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c
index db82d29..46f539c 100644
--- a/crypto/asn1/a_time.c
+++ b/crypto/asn1/a_time.c
@@ -59,7 +59,7 @@ int ASN1_TIME_check(const ASN1_TIME *t)
 }
 
 /* Convert an ASN1_TIME structure to GeneralizedTime */
-ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t,
+ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(const ASN1_TIME *t,
                                                    ASN1_GENERALIZEDTIME **out)
 {
     ASN1_GENERALIZEDTIME *ret = NULL;
diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h
index 0bbdaba..2e239f7 100644
--- a/include/openssl/asn1.h
+++ b/include/openssl/asn1.h
@@ -625,8 +625,8 @@ ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t);
 ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s, time_t t,
                          int offset_day, long offset_sec);
 int ASN1_TIME_check(const ASN1_TIME *t);
-ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME
-                                                   **out);
+ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(const ASN1_TIME *t,
+                                                   ASN1_GENERALIZEDTIME **out);
 int ASN1_TIME_set_string(ASN1_TIME *s, const char *str);
 
 int i2a_ASN1_INTEGER(BIO *bp, const ASN1_INTEGER *a);
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 20ec1e5..a2d6862 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1996,7 +1996,7 @@ int SSL_set_block_padding(SSL *ssl, size_t block_size);
 # endif
 
 __owur int SSL_session_reused(SSL *s);
-__owur int SSL_is_server(SSL *s);
+__owur int SSL_is_server(const SSL *s);
 
 __owur __owur SSL_CONF_CTX *SSL_CONF_CTX_new(void);
 int SSL_CONF_CTX_finish(SSL_CONF_CTX *cctx);
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index b81b9ea..de63f84 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -4015,7 +4015,7 @@ int SSL_session_reused(SSL *s)
     return s->hit;
 }
 
-int SSL_is_server(SSL *s)
+int SSL_is_server(const SSL *s)
 {
     return s->server;
 }