diff options
Diffstat (limited to 'include/crypto')
| -rw-r--r-- | include/crypto/store.h | 10 | ||||
| -rw-r--r-- | include/crypto/x509.h | 11 |
2 files changed, 8 insertions, 13 deletions
diff --git a/include/crypto/store.h b/include/crypto/store.h index c47581a508..8bd2bc022f 100644 --- a/include/crypto/store.h +++ b/include/crypto/store.h @@ -14,16 +14,6 @@ # include <openssl/store.h> # include <openssl/ui.h> -/* - * Two functions to read PEM data off an already opened BIO. To be used - * instead of OSSLSTORE_open() and OSSLSTORE_close(). Everything is done - * as usual with OSSLSTORE_load() and OSSLSTORE_eof(). - */ -OSSL_STORE_CTX *ossl_store_attach_pem_bio(BIO *bp, const UI_METHOD *ui_method, - void *ui_data, OPENSSL_CTX *libctx, - const char *propq); -int ossl_store_detach_pem_bio(OSSL_STORE_CTX *ctx); - void ossl_store_cleanup_int(void); #endif diff --git a/include/crypto/x509.h b/include/crypto/x509.h index 611713f221..71a67df650 100644 --- a/include/crypto/x509.h +++ b/include/crypto/x509.h @@ -189,6 +189,9 @@ struct x509_st { /* Set on live certificates for authentication purposes */ ASN1_OCTET_STRING *distinguishing_id; + + OPENSSL_CTX *libctx; + const char *propq; } /* X509 */ ; /* @@ -295,9 +298,11 @@ struct x509_object_st { int a2i_ipadd(unsigned char *ipout, const char *ipasc); int x509_set1_time(ASN1_TIME **ptm, const ASN1_TIME *tm); int x509_print_ex_brief(BIO *bio, X509 *cert, unsigned long neg_cflags); +int x509v3_cache_extensions(X509 *x); void x509_init_sig_info(X509 *x); - -int x509_check_issued_int(X509 *issuer, X509 *subject, OPENSSL_CTX *libctx, - const char *propq); +int asn1_item_digest_with_libctx(const ASN1_ITEM *it, const EVP_MD *type, + void *data, unsigned char *md, + unsigned int *len, OPENSSL_CTX *libctx, + const char *propq); |