diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2016-08-26 01:53:27 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-08-26 02:12:37 +0900 |
| commit | bb170849428dab1463a8e6ec6109beb0d9da0058 (patch) | |
| tree | 310d1b4d1e6082ddfc0bdf11ae44a673e2c56c26 /ext/openssl/openssl_missing.h | |
| parent | a3311831a1b16beea04cd716769def7bd9887bd3 (diff) | |
| download | ruby-openssl-bb170849428dab1463a8e6ec6109beb0d9da0058.tar.gz | |
Adapt to OpenSSL changes after the 1.1.0-pre6
Fix compiler errors and warnings. The order of parameters of
X509_{CRL,REQ}_get0_signature() has been changed, and certificate and
CRL time accessors have been reorganized: *_get_* functions are
deprecated and replaced by *_get0_* that return a const pointer.
Diffstat (limited to 'ext/openssl/openssl_missing.h')
| -rw-r--r-- | ext/openssl/openssl_missing.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h index d2fdce16..897d6235 100644 --- a/ext/openssl/openssl_missing.h +++ b/ext/openssl/openssl_missing.h @@ -110,11 +110,11 @@ void HMAC_CTX_free(HMAC_CTX *ctx); #endif #if !defined(HAVE_X509_CRL_GET0_SIGNATURE) -void X509_CRL_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg, X509_CRL *crl); +void X509_CRL_get0_signature(const X509_CRL *, const ASN1_BIT_STRING **, const X509_ALGOR **); #endif #if !defined(HAVE_X509_REQ_GET0_SIGNATURE) -void X509_REQ_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg, X509_REQ *req); +void X509_REQ_get0_signature(const X509_REQ *, const ASN1_BIT_STRING **, const X509_ALGOR **); #endif #if !defined(HAVE_X509_REVOKED_GET0_SERIALNUMBER) @@ -234,4 +234,11 @@ IMPL_PKEY_GETTER(EC_KEY, ec) # define EVP_CTRL_AEAD_SET_IVLEN EVP_CTRL_GCM_SET_IVLEN #endif +#if !defined(HAVE_X509_GET0_NOTBEFORE) +# define X509_get0_notBefore(x) X509_get_notBefore(x) +# define X509_get0_notAfter(x) X509_get_notAfter(x) +# define X509_CRL_get0_lastUpdate(x) X509_CRL_get_lastUpdate(x) +# define X509_CRL_get0_nextUpdate(x) X509_CRL_get_nextUpdate(x) +#endif + #endif /* _OSSL_OPENSSL_MISSING_H_ */ |