X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fevp%2Fevp.h;h=be16b5eceee1b879e17350045cbc5975029355cf;hp=509f8579af2a40d66c7ea97e67c077eab1c032df;hb=b7683e3a5d93aa5319263b7bbfd0fee18f25955e;hpb=5ba4bf35c5c596b86b56bde5977d252900367cad diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index 509f8579af..be16b5ecee 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -218,6 +218,7 @@ typedef int evp_verify_method(int type,const unsigned char *m, /* Digest ctrls */ #define EVP_MD_CTRL_DIGALGID 0x1 +#define EVP_MD_CTRL_MICALG 0x2 /* Minimum Algorithm specific ctrl value */ @@ -455,6 +456,9 @@ typedef int (EVP_PBE_KEYGEN)(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, #define EVP_SignDigestUpdate(a,b,c) EVP_DigestUpdate(a,b,c) #define EVP_VerifyDigestUpdate(a,b,c) EVP_DigestUpdate(a,b,c) +#define EVP_DigestSignUpdate(a,b,c) EVP_DigestUpdate(a,b,c) +#define EVP_DigestVerifyUpdate(a,b,c) EVP_DigestUpdate(a,b,c) + #ifdef CONST_STRICT void BIO_set_md(BIO *,const EVP_MD *md); #else @@ -981,10 +985,12 @@ void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth, EVP_PKEY_CTRL_MD, 0, (void *)md) #define EVP_PKEY_CTRL_MD 1 -#define EVP_PKEY_CTRL_PEER_KEY 2 +#define EVP_PKEY_CTRL_PEER_KEY 2 + +#define EVP_PKEY_CTRL_PKCS7_ENCRYPT 3 +#define EVP_PKEY_CTRL_PKCS7_DECRYPT 4 -#define EVP_PKEY_CTRL_PKCS7_ENCRYPT 3 -#define EVP_PKEY_CTRL_PKCS7_DECRYPT 4 +#define EVP_PKEY_CTRL_PKCS7_SIGN 5 #define EVP_PKEY_ALG_CTRL 0x1000