diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x509.h')
| -rw-r--r-- | src/lib/libcrypto/x509/x509.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h index e6f8a40395..092dd7450d 100644 --- a/src/lib/libcrypto/x509/x509.h +++ b/src/lib/libcrypto/x509/x509.h | |||
| @@ -657,11 +657,15 @@ int NETSCAPE_SPKI_set_pubkey(NETSCAPE_SPKI *x, EVP_PKEY *pkey); | |||
| 657 | 657 | ||
| 658 | int NETSCAPE_SPKI_print(BIO *out, NETSCAPE_SPKI *spki); | 658 | int NETSCAPE_SPKI_print(BIO *out, NETSCAPE_SPKI *spki); |
| 659 | 659 | ||
| 660 | int X509_signature_dump(BIO *bp,const ASN1_STRING *sig, int indent); | ||
| 660 | int X509_signature_print(BIO *bp,X509_ALGOR *alg, ASN1_STRING *sig); | 661 | int X509_signature_print(BIO *bp,X509_ALGOR *alg, ASN1_STRING *sig); |
| 661 | 662 | ||
| 662 | int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md); | 663 | int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md); |
| 664 | int X509_sign_ctx(X509 *x, EVP_MD_CTX *ctx); | ||
| 663 | int X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md); | 665 | int X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md); |
| 666 | int X509_REQ_sign_ctx(X509_REQ *x, EVP_MD_CTX *ctx); | ||
| 664 | int X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md); | 667 | int X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md); |
| 668 | int X509_CRL_sign_ctx(X509_CRL *x, EVP_MD_CTX *ctx); | ||
| 665 | int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md); | 669 | int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md); |
| 666 | 670 | ||
| 667 | int X509_pubkey_digest(const X509 *data,const EVP_MD *type, | 671 | int X509_pubkey_digest(const X509 *data,const EVP_MD *type, |
| @@ -763,6 +767,7 @@ X509_ALGOR *X509_ALGOR_dup(X509_ALGOR *xn); | |||
| 763 | int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval); | 767 | int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval); |
| 764 | void X509_ALGOR_get0(ASN1_OBJECT **paobj, int *pptype, void **ppval, | 768 | void X509_ALGOR_get0(ASN1_OBJECT **paobj, int *pptype, void **ppval, |
| 765 | X509_ALGOR *algor); | 769 | X509_ALGOR *algor); |
| 770 | void X509_ALGOR_set_md(X509_ALGOR *alg, const EVP_MD *md); | ||
| 766 | 771 | ||
| 767 | X509_NAME *X509_NAME_dup(X509_NAME *xn); | 772 | X509_NAME *X509_NAME_dup(X509_NAME *xn); |
| 768 | X509_NAME_ENTRY *X509_NAME_ENTRY_dup(X509_NAME_ENTRY *ne); | 773 | X509_NAME_ENTRY *X509_NAME_ENTRY_dup(X509_NAME_ENTRY *ne); |
| @@ -896,6 +901,9 @@ int ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *algor1, | |||
| 896 | int ASN1_item_sign(const ASN1_ITEM *it, X509_ALGOR *algor1, X509_ALGOR *algor2, | 901 | int ASN1_item_sign(const ASN1_ITEM *it, X509_ALGOR *algor1, X509_ALGOR *algor2, |
| 897 | ASN1_BIT_STRING *signature, | 902 | ASN1_BIT_STRING *signature, |
| 898 | void *data, EVP_PKEY *pkey, const EVP_MD *type); | 903 | void *data, EVP_PKEY *pkey, const EVP_MD *type); |
| 904 | int ASN1_item_sign_ctx(const ASN1_ITEM *it, | ||
| 905 | X509_ALGOR *algor1, X509_ALGOR *algor2, | ||
| 906 | ASN1_BIT_STRING *signature, void *asn, EVP_MD_CTX *ctx); | ||
| 899 | #endif | 907 | #endif |
| 900 | 908 | ||
| 901 | int X509_set_version(X509 *x,long version); | 909 | int X509_set_version(X509 *x,long version); |
| @@ -1161,6 +1169,9 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, | |||
| 1161 | unsigned char *salt, int saltlen, | 1169 | unsigned char *salt, int saltlen, |
| 1162 | unsigned char *aiv, int prf_nid); | 1170 | unsigned char *aiv, int prf_nid); |
| 1163 | 1171 | ||
| 1172 | X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, | ||
| 1173 | int prf_nid, int keylen); | ||
| 1174 | |||
| 1164 | /* PKCS#8 utilities */ | 1175 | /* PKCS#8 utilities */ |
| 1165 | 1176 | ||
| 1166 | DECLARE_ASN1_FUNCTIONS(PKCS8_PRIV_KEY_INFO) | 1177 | DECLARE_ASN1_FUNCTIONS(PKCS8_PRIV_KEY_INFO) |
