[openssl-commits] [openssl] master update
Dr. Stephen Henson
steve at openssl.org
Mon Aug 1 19:02:05 UTC 2016
The branch master has been updated
via c2e888b54c3b25e89732f6ba66e489ef1ee5ef59 (commit)
via b26ab17f3d3f56be57000e99b8ad94a4e90197a6 (commit)
via 67302ade22b99eaa42031016d4861068b0681db3 (commit)
from 10b0b817a0abe54f5dabe3b21717d77569ad2d9b (commit)
- Log -----------------------------------------------------------------
commit c2e888b54c3b25e89732f6ba66e489ef1ee5ef59
Author: Dr. Stephen Henson <steve at openssl.org>
Date: Mon Aug 1 19:16:52 2016 +0100
Document certificate and CRL time functions.
RT#4639
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit b26ab17f3d3f56be57000e99b8ad94a4e90197a6
Author: Dr. Stephen Henson <steve at openssl.org>
Date: Mon Aug 1 19:30:34 2016 +0100
Constify some X509_CRL, X509_REQ functions.
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit 67302ade22b99eaa42031016d4861068b0681db3
Author: Dr. Stephen Henson <steve at openssl.org>
Date: Mon Aug 1 19:25:16 2016 +0100
Constify some X509_CRL functions.
Reviewed-by: Rich Salz <rsalz at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
crypto/x509/x509_req.c | 4 +-
crypto/x509/x509cset.c | 8 ++--
doc/crypto/X509_get_notBefore.pod | 92 ++++++++++++++++++++++++++++++++++++
doc/crypto/X509_get_subject_name.pod | 4 +-
doc/crypto/X509_get_version.pod | 4 +-
include/openssl/x509.h | 12 ++---
6 files changed, 108 insertions(+), 16 deletions(-)
create mode 100644 doc/crypto/X509_get_notBefore.pod
diff --git a/crypto/x509/x509_req.c b/crypto/x509/x509_req.c
index 3574322..e1d2c20 100644
--- a/crypto/x509/x509_req.c
+++ b/crypto/x509/x509_req.c
@@ -267,12 +267,12 @@ int X509_REQ_add1_attr_by_txt(X509_REQ *req,
return 0;
}
-long X509_REQ_get_version(X509_REQ *req)
+long X509_REQ_get_version(const X509_REQ *req)
{
return ASN1_INTEGER_get(req->req_info.version);
}
-X509_NAME *X509_REQ_get_subject_name(X509_REQ *req)
+X509_NAME *X509_REQ_get_subject_name(const X509_REQ *req)
{
return req->req_info.subject;
}
diff --git a/crypto/x509/x509cset.c b/crypto/x509/x509cset.c
index 3763492..1498054 100644
--- a/crypto/x509/x509cset.c
+++ b/crypto/x509/x509cset.c
@@ -95,22 +95,22 @@ int X509_CRL_up_ref(X509_CRL *crl)
return ((i > 1) ? 1 : 0);
}
-long X509_CRL_get_version(X509_CRL *crl)
+long X509_CRL_get_version(const X509_CRL *crl)
{
return ASN1_INTEGER_get(crl->crl.version);
}
-ASN1_TIME *X509_CRL_get_lastUpdate(X509_CRL *crl)
+ASN1_TIME *X509_CRL_get_lastUpdate(const X509_CRL *crl)
{
return crl->crl.lastUpdate;
}
-ASN1_TIME *X509_CRL_get_nextUpdate(X509_CRL *crl)
+ASN1_TIME *X509_CRL_get_nextUpdate(const X509_CRL *crl)
{
return crl->crl.nextUpdate;
}
-X509_NAME *X509_CRL_get_issuer(X509_CRL *crl)
+X509_NAME *X509_CRL_get_issuer(const X509_CRL *crl)
{
return crl->crl.issuer;
}
diff --git a/doc/crypto/X509_get_notBefore.pod b/doc/crypto/X509_get_notBefore.pod
new file mode 100644
index 0000000..ebbd156
--- /dev/null
+++ b/doc/crypto/X509_get_notBefore.pod
@@ -0,0 +1,92 @@
+=pod
+
+=head1 NAME
+
+X509_get_notBefore, X509_get_notAfter, X509_set_notBefore,
+X509_set_notAfter, X509_CRL_get_lastUpdate, X509_CRL_get_nextUpdate,
+X509_CRL_set_lastUpdate, X509_CRL_set_nextUpdate - get or set certificate
+or CRL dates
+
+=head1 SYNOPSIS
+
+ #include <openssl/x509.h>
+
+ ASN1_TIME *X509_get_notBefore(const X509 *x);
+ ASN1_TIME *X509_get_notAfter(const X509 *x);
+
+ int X509_set_notBefore(X509 *x, const ASN1_TIME *tm);
+ int X509_set_notAfter(X509 *x, const ASN1_TIME *tm);
+
+ ASN1_TIME *X509_CRL_get_lastUpdate(const X509_CRL *crl);
+ ASN1_TIME *X509_CRL_get_nextUpdate(const X509_CRL *crl);
+
+ int X509_CRL_set_lastUpdate(X509_CRL *x, const ASN1_TIME *tm);
+ int X509_CRL_set_nextUpdate(X509_CRL *x, const ASN1_TIME *tm);
+
+=head1 DESCRIPTION
+
+X509_get_notBefore() and X509_get_notAfter() return the B<notBefore>
+and B<notAfter> fields of certificate B<x> respectively. The value
+returned is an internal pointer which must not be freed up after
+the call.
+
+X509_set_notBefore() and X509_set_notAfter() set the B<notBefore>
+and B<notAfter> fields of B<x> to B<tm>. Ownership of the passed
+parameter B<tm> is not transferred by these functions so it must
+be freed up after the call.
+
+X509_CRL_get_lastUpdate() and X509_CRL_get_nextUpdate() return the
+B<lastUpdate> and B<nextUpdate> fields of B<crl>. The value
+returned is an internal pointer which must not be freed up after
+the call. If the B<nextUpdate> field is absent from B<crl> then
+B<NULL> is returned.
+
+X509_CRL_set_lastUpdate() and X509_CRL_set_nextUpdate() set the B<lastUpdate>
+and B<nextUpdate> fields of B<crl> to B<tm>. Ownership of the passed parameter
+B<tm> is not transferred by these functions so it must be freed up after the
+call.
+
+=head1 RETURN VALUES
+
+X509_get_notBefore(), X509_get_notAfter() and X509_CRL_get_lastUpdate()
+return a pointer to an B<ASN1_TIME> structure.
+
+X509_CRL_get_lastUpdate() return a pointer to an B<ASN1_TIME> structure
+or NULL if the B<lastUpdate> field is absent.
+
+X509_set_notBefore(), X509_set_notAfter(), X509_CRL_set_lastUpdate() and
+X509_CRL_set_nextUpdate() return 1 for success or 0 for failure.
+
+=head1 SEE ALSO
+
+L<d2i_X509(3)>,
+L<ERR_get_error(3)>,
+L<X509_CRL_get0_by_serial(3)>,
+L<X509_get0_signature(3)>,
+L<X509_get_ext_d2i(3)>,
+L<X509_get_extension_flags(3)>,
+L<X509_get_pubkey(3)>,
+L<X509_get_subject_name(3)>,
+L<X509_NAME_add_entry_by_txt(3)>,
+L<X509_NAME_ENTRY_get_object(3)>,
+L<X509_NAME_get_index_by_NID(3)>,
+L<X509_NAME_print_ex(3)>,
+L<X509_new(3)>,
+L<X509_sign(3)>,
+L<X509V3_get_d2i(3)>,
+L<X509_verify_cert(3)>
+
+=head1 HISTORY
+
+These functions are available in all versions of OpenSSL.
+
+=head1 COPYRIGHT
+
+Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+
+Licensed under the OpenSSL license (the "License"). You may not use
+this file except in compliance with the License. You can obtain a copy
+in the file LICENSE in the source distribution or at
+L<https://www.openssl.org/source/license.html>.
+
+=cut
diff --git a/doc/crypto/X509_get_subject_name.pod b/doc/crypto/X509_get_subject_name.pod
index 408cd88..ce36bbf 100644
--- a/doc/crypto/X509_get_subject_name.pod
+++ b/doc/crypto/X509_get_subject_name.pod
@@ -17,10 +17,10 @@ subject names
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);
+ X509_NAME *X509_REQ_get_subject_name(const X509_REQ *req);
int X509_REQ_set_subject_name(X509_REQ *req, X509_NAME *name);
- X509_NAME *X509_CRL_get_issuer(X509_CRL *crl);
+ X509_NAME *X509_CRL_get_issuer(const X509_CRL *crl);
int X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name);
=head1 DESCRIPTION
diff --git a/doc/crypto/X509_get_version.pod b/doc/crypto/X509_get_version.pod
index 9e8c123..c1826ea 100644
--- a/doc/crypto/X509_get_version.pod
+++ b/doc/crypto/X509_get_version.pod
@@ -13,10 +13,10 @@ certificate request or CRL version
long X509_get_version(const X509 *x);
int X509_set_version(X509 *x, long version);
- long X509_REQ_get_version(X509_REQ *req);
+ long X509_REQ_get_version(const X509_REQ *req);
int X509_REQ_set_version(X509_REQ *x, long version);
- long X509_CRL_get_version(X509_CRL *crl);
+ long X509_CRL_get_version(const X509_CRL *crl);
int X509_CRL_set_version(X509_CRL *x, long version);
=head1 DESCRIPTION
diff --git a/include/openssl/x509.h b/include/openssl/x509.h
index e68d4b3..b1722c7 100644
--- a/include/openssl/x509.h
+++ b/include/openssl/x509.h
@@ -638,9 +638,9 @@ EVP_PKEY *X509_get_pubkey(X509 *x);
ASN1_BIT_STRING *X509_get0_pubkey_bitstr(const X509 *x);
int X509_certificate_type(X509 *x, EVP_PKEY *pubkey /* optional */ );
-long X509_REQ_get_version(X509_REQ *req);
+long X509_REQ_get_version(const X509_REQ *req);
int X509_REQ_set_version(X509_REQ *x, long version);
-X509_NAME *X509_REQ_get_subject_name(X509_REQ *req);
+X509_NAME *X509_REQ_get_subject_name(const X509_REQ *req);
int X509_REQ_set_subject_name(X509_REQ *req, X509_NAME *name);
void X509_REQ_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,
X509_REQ *req);
@@ -681,10 +681,10 @@ int X509_CRL_set_nextUpdate(X509_CRL *x, const ASN1_TIME *tm);
int X509_CRL_sort(X509_CRL *crl);
int X509_CRL_up_ref(X509_CRL *crl);
-long X509_CRL_get_version(X509_CRL *crl);
-ASN1_TIME *X509_CRL_get_lastUpdate(X509_CRL *crl);
-ASN1_TIME *X509_CRL_get_nextUpdate(X509_CRL *crl);
-X509_NAME *X509_CRL_get_issuer(X509_CRL *crl);
+long X509_CRL_get_version(const X509_CRL *crl);
+ASN1_TIME *X509_CRL_get_lastUpdate(const X509_CRL *crl);
+ASN1_TIME *X509_CRL_get_nextUpdate(const X509_CRL *crl);
+X509_NAME *X509_CRL_get_issuer(const X509_CRL *crl);
STACK_OF(X509_EXTENSION) *X509_CRL_get0_extensions(X509_CRL *crl);
STACK_OF(X509_REVOKED) *X509_CRL_get_REVOKED(X509_CRL *crl);
void X509_CRL_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,
More information about the openssl-commits
mailing list