diff options
| author | Matt Caswell <matt@openssl.org> | 2016-08-12 21:37:55 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-08-17 12:29:03 +0100 |
| commit | 79613ea8442a309b76a737eacb2a69f612cc5f06 (patch) | |
| tree | b0410b412380701adbb8028600e0b40e62c47cd8 | |
| parent | 245c6bc33b1481052f347f316cec16888aa1be85 (diff) | |
| download | openssl-79613ea8442a309b76a737eacb2a69f612cc5f06.tar.gz | |
Convert OCSP* functions to use const getters
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Stephen Henson <steve@openssl.org>
| -rw-r--r-- | crypto/ocsp/ocsp_cl.c | 8 | ||||
| -rw-r--r-- | doc/crypto/OCSP_resp_find_status.pod | 3 | ||||
| -rw-r--r-- | include/openssl/ocsp.h | 6 |
3 files changed, 8 insertions, 9 deletions
diff --git a/crypto/ocsp/ocsp_cl.c b/crypto/ocsp/ocsp_cl.c index 0ae474b332..a42b80fa5b 100644 --- a/crypto/ocsp/ocsp_cl.c +++ b/crypto/ocsp/ocsp_cl.c @@ -161,7 +161,7 @@ OCSP_BASICRESP *OCSP_response_get1_basic(OCSP_RESPONSE *resp) return ASN1_item_unpack(rb->response, ASN1_ITEM_rptr(OCSP_BASICRESP)); } -ASN1_OCTET_STRING *OCSP_resp_get0_signature(OCSP_BASICRESP *bs) +const ASN1_OCTET_STRING *OCSP_resp_get0_signature(const OCSP_BASICRESP *bs) { return bs->signature; } @@ -186,10 +186,8 @@ OCSP_SINGLERESP *OCSP_resp_get0(OCSP_BASICRESP *bs, int idx) return sk_OCSP_SINGLERESP_value(bs->tbsResponseData.responses, idx); } -ASN1_GENERALIZEDTIME *OCSP_resp_get0_produced_at(OCSP_BASICRESP* bs) +const ASN1_GENERALIZEDTIME *OCSP_resp_get0_produced_at(const OCSP_BASICRESP* bs) { - if (!bs) - return NULL; return bs->tbsResponseData.producedAt; } @@ -361,7 +359,7 @@ int OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, return ret; } -OCSP_CERTID *OCSP_SINGLERESP_get0_id(OCSP_SINGLERESP *single) +const OCSP_CERTID *OCSP_SINGLERESP_get0_id(const OCSP_SINGLERESP *single) { return single->certId; } diff --git a/doc/crypto/OCSP_resp_find_status.pod b/doc/crypto/OCSP_resp_find_status.pod index 2dcd318f54..36f66a858f 100644 --- a/doc/crypto/OCSP_resp_find_status.pod +++ b/doc/crypto/OCSP_resp_find_status.pod @@ -27,7 +27,8 @@ OCSP_single_get0_status, OCSP_check_validity ASN1_GENERALIZEDTIME **thisupd, ASN1_GENERALIZEDTIME **nextupd); - ASN1_GENERALIZEDTIME *OCSP_resp_get0_produced_at(OCSP_BASICRESP* single); + const ASN1_GENERALIZEDTIME *OCSP_resp_get0_produced_at( + const OCSP_BASICRESP* single); const STACK_OF(X509) *OCSP_resp_get0_certs(const OCSP_BASICRESP *bs); diff --git a/include/openssl/ocsp.h b/include/openssl/ocsp.h index 64e0ee4bf6..a1e4e88201 100644 --- a/include/openssl/ocsp.h +++ b/include/openssl/ocsp.h @@ -208,11 +208,11 @@ int OCSP_request_sign(OCSP_REQUEST *req, int OCSP_response_status(OCSP_RESPONSE *resp); OCSP_BASICRESP *OCSP_response_get1_basic(OCSP_RESPONSE *resp); -ASN1_OCTET_STRING *OCSP_resp_get0_signature(OCSP_BASICRESP *bs); +const ASN1_OCTET_STRING *OCSP_resp_get0_signature(const OCSP_BASICRESP *bs); int OCSP_resp_count(OCSP_BASICRESP *bs); OCSP_SINGLERESP *OCSP_resp_get0(OCSP_BASICRESP *bs, int idx); -ASN1_GENERALIZEDTIME *OCSP_resp_get0_produced_at(OCSP_BASICRESP* bs); +const ASN1_GENERALIZEDTIME *OCSP_resp_get0_produced_at(const OCSP_BASICRESP* bs); const STACK_OF(X509) *OCSP_resp_get0_certs(const OCSP_BASICRESP *bs); int OCSP_resp_get0_id(const OCSP_BASICRESP *bs, const ASN1_OCTET_STRING **pid, @@ -318,7 +318,7 @@ void *OCSP_SINGLERESP_get1_ext_d2i(OCSP_SINGLERESP *x, int nid, int *crit, int OCSP_SINGLERESP_add1_ext_i2d(OCSP_SINGLERESP *x, int nid, void *value, int crit, unsigned long flags); int OCSP_SINGLERESP_add_ext(OCSP_SINGLERESP *x, X509_EXTENSION *ex, int loc); -OCSP_CERTID *OCSP_SINGLERESP_get0_id(OCSP_SINGLERESP *x); +const OCSP_CERTID *OCSP_SINGLERESP_get0_id(const OCSP_SINGLERESP *x); DECLARE_ASN1_FUNCTIONS(OCSP_SINGLERESP) DECLARE_ASN1_FUNCTIONS(OCSP_CERTSTATUS) |