diff options
| author | Matt Caswell <matt@openssl.org> | 2016-03-21 16:54:53 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-04-06 14:57:45 +0100 |
| commit | 3e41ac35281827b59e55d51058cf6bb086c1f2b5 (patch) | |
| tree | a8064c66c48200152a8c6f4ac45a7a93ccfec506 /crypto | |
| parent | 7626fbf2ef70e02f47afe59b7dd7210e75371ed7 (diff) | |
Fix no-ocsp
Misc fixes for no-ocsp
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/err/err_all.c | 2 | ||||
| -rw-r--r-- | crypto/x509/x_all.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index 78cdd5bb06..f939db702e 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -132,7 +132,9 @@ void err_load_crypto_strings_intern(void) # ifndef OPENSSL_NO_ENGINE ERR_load_ENGINE_strings(); # endif +# ifndef OPENSSL_NO_OCSP ERR_load_OCSP_strings(); +# endif #ifndef OPENSSL_NO_UI ERR_load_UI_strings(); #endif diff --git a/crypto/x509/x_all.c b/crypto/x509/x_all.c index c370ba94bb..0f28c58f2b 100644 --- a/crypto/x509/x_all.c +++ b/crypto/x509/x_all.c @@ -103,11 +103,13 @@ int X509_sign_ctx(X509 *x, EVP_MD_CTX *ctx) &x->sig_alg, &x->signature, &x->cert_info, ctx); } +#ifndef OPENSSL_NO_OCSP int X509_http_nbio(OCSP_REQ_CTX *rctx, X509 **pcert) { return OCSP_REQ_CTX_nbio_d2i(rctx, (ASN1_VALUE **)pcert, ASN1_ITEM_rptr(X509)); } +#endif int X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md) { @@ -137,12 +139,14 @@ int X509_CRL_sign_ctx(X509_CRL *x, EVP_MD_CTX *ctx) &x->crl, ctx); } +#ifndef OPENSSL_NO_OCSP int X509_CRL_http_nbio(OCSP_REQ_CTX *rctx, X509_CRL **pcrl) { return OCSP_REQ_CTX_nbio_d2i(rctx, (ASN1_VALUE **)pcrl, ASN1_ITEM_rptr(X509_CRL)); } +#endif int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md) { |