[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  e1f02308aeb124168d8a6655e5c822c3b0126260 (commit)
       via  22293ea1cc3c6b8eef16d75b7a63242c8b3375c5 (commit)
       via  1421aeadd757e0c564314ba62521979d08884ccc (commit)
      from  e5452d40be3954a12b62fa8ce6746e8a792216e1 (commit)


- Log -----------------------------------------------------------------
commit e1f02308aeb124168d8a6655e5c822c3b0126260
Author: Richard J. Moore <rich at kde.org>
Date:   Sat Jul 30 19:34:06 2016 +0100

    Fix the docs too
    
    Reviewed-by: Stephen Henson <steve at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1367)

commit 22293ea1cc3c6b8eef16d75b7a63242c8b3375c5
Author: Richard J. Moore <rich at kde.org>
Date:   Sat Jul 30 18:36:16 2016 +0100

    Ignore the serial number for now and just do the rest.
    
    Reviewed-by: Stephen Henson <steve at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1367)

commit 1421aeadd757e0c564314ba62521979d08884ccc
Author: Richard J. Moore <rich at kde.org>
Date:   Sat Jul 30 11:47:18 2016 +0100

    Make some more X509 functions const.
    
    Reviewed-by: Stephen Henson <steve at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1367)

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

Summary of changes:
 crypto/x509/x509_cmp.c               |  4 ++--
 crypto/x509/x509_set.c               |  6 +++---
 doc/crypto/X509_get_subject_name.pod |  4 ++--
 doc/crypto/X509_get_version.pod      |  2 +-
 include/openssl/x509.h               | 10 +++++-----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c
index 191a8b0..a33fd47 100644
--- a/crypto/x509/x509_cmp.c
+++ b/crypto/x509/x509_cmp.c
@@ -80,7 +80,7 @@ int X509_CRL_match(const X509_CRL *a, const X509_CRL *b)
     return memcmp(a->sha1_hash, b->sha1_hash, 20);
 }
 
-X509_NAME *X509_get_issuer_name(X509 *a)
+X509_NAME *X509_get_issuer_name(const X509 *a)
 {
     return (a->cert_info.issuer);
 }
@@ -97,7 +97,7 @@ unsigned long X509_issuer_name_hash_old(X509 *x)
 }
 #endif
 
-X509_NAME *X509_get_subject_name(X509 *a)
+X509_NAME *X509_get_subject_name(const X509 *a)
 {
     return (a->cert_info.subject);
 }
diff --git a/crypto/x509/x509_set.c b/crypto/x509/x509_set.c
index 6addfbe..ecf5f04 100644
--- a/crypto/x509/x509_set.c
+++ b/crypto/x509/x509_set.c
@@ -110,17 +110,17 @@ int X509_up_ref(X509 *x)
     return ((i > 1) ? 1 : 0);
 }
 
-long X509_get_version(X509 *x)
+long X509_get_version(const X509 *x)
 {
     return ASN1_INTEGER_get(x->cert_info.version);
 }
 
-ASN1_TIME * X509_get_notBefore(X509 *x)
+ASN1_TIME * X509_get_notBefore(const X509 *x)
 {
     return x->cert_info.validity.notBefore;
 }
 
-ASN1_TIME *X509_get_notAfter(X509 *x)
+ASN1_TIME *X509_get_notAfter(const X509 *x)
 {
     return x->cert_info.validity.notAfter;
 }
diff --git a/doc/crypto/X509_get_subject_name.pod b/doc/crypto/X509_get_subject_name.pod
index 3889735..408cd88 100644
--- a/doc/crypto/X509_get_subject_name.pod
+++ b/doc/crypto/X509_get_subject_name.pod
@@ -11,10 +11,10 @@ subject names
 
  #include <openssl/x509.h>
 
- X509_NAME *X509_get_subject_name(X509 *x);
+ X509_NAME *X509_get_subject_name(const X509 *x);
  int X509_set_subject_name(X509 *x, X509_NAME *name);
 
- X509_NAME *X509_get_issuer_name(X509 *x);
+ X509_NAME *X509_get_issuer_name(const X509 *x);
  int X509_set_issuer_name(X509 *x, X509_NAME *name);
 
  X509_NAME *X509_REQ_get_subject_name(X509_REQ *req);
diff --git a/doc/crypto/X509_get_version.pod b/doc/crypto/X509_get_version.pod
index c7decc3..9e8c123 100644
--- a/doc/crypto/X509_get_version.pod
+++ b/doc/crypto/X509_get_version.pod
@@ -10,7 +10,7 @@ certificate request or CRL version
 
  #include <openssl/x509.h>
 
- long X509_get_version(X509 *x);
+ long X509_get_version(const X509 *x);
  int X509_set_version(X509 *x, long version);
 
  long X509_REQ_get_version(X509_REQ *req);
diff --git a/include/openssl/x509.h b/include/openssl/x509.h
index 7546895..e68d4b3 100644
--- a/include/openssl/x509.h
+++ b/include/openssl/x509.h
@@ -609,17 +609,17 @@ int ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1,
                        X509_ALGOR *algor2, ASN1_BIT_STRING *signature,
                        void *asn, EVP_MD_CTX *ctx);
 
-long X509_get_version(X509 *x);
+long X509_get_version(const X509 *x);
 int X509_set_version(X509 *x, long version);
 int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial);
 ASN1_INTEGER *X509_get_serialNumber(X509 *x);
 int X509_set_issuer_name(X509 *x, X509_NAME *name);
-X509_NAME *X509_get_issuer_name(X509 *a);
+X509_NAME *X509_get_issuer_name(const X509 *a);
 int X509_set_subject_name(X509 *x, X509_NAME *name);
-X509_NAME *X509_get_subject_name(X509 *a);
-ASN1_TIME * X509_get_notBefore(X509 *x);
+X509_NAME *X509_get_subject_name(const X509 *a);
+ASN1_TIME * X509_get_notBefore(const X509 *x);
 int X509_set_notBefore(X509 *x, const ASN1_TIME *tm);
-ASN1_TIME *X509_get_notAfter(X509 *x);
+ASN1_TIME *X509_get_notAfter(const X509 *x);
 int X509_set_notAfter(X509 *x, const ASN1_TIME *tm);
 int X509_set_pubkey(X509 *x, EVP_PKEY *pkey);
 int X509_up_ref(X509 *x);