diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2006-04-07 17:28:56 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2006-04-07 17:28:56 +0000 |
| commit | cd7638980a2c2b16bb121bcb2ea8cc3cb03afcc1 (patch) | |
| tree | abb202eb379913728f323d7f60614103bd41333e /crypto/evp/evp_locl.h | |
| parent | f733a5ef0ede95494996ebef63e2a04bdc963230 (diff) | |
Include EVP_PKEY argument in EVP_PKEY_CTX_new(). This avoids the
need for a separate EVP_PKEY parameter in the other operation
initialization routines.
Diffstat (limited to 'crypto/evp/evp_locl.h')
| -rw-r--r-- | crypto/evp/evp_locl.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/crypto/evp/evp_locl.h b/crypto/evp/evp_locl.h index f33803ba4c..26000ac08b 100644 --- a/crypto/evp/evp_locl.h +++ b/crypto/evp/evp_locl.h @@ -266,39 +266,37 @@ struct evp_pkey_method_st int (*init)(EVP_PKEY_CTX *ctx); int (*paramgen_init)(EVP_PKEY_CTX *ctx); - int (*paramgen)(EVP_PKEY *key, EVP_PKEY_CTX *ctx); + int (*paramgen)(EVP_PKEY_CTX *ctx); int (*keygen_init)(EVP_PKEY_CTX *ctx); - int (*keygen)(EVP_PKEY *key, EVP_PKEY_CTX *ctx); + int (*keygen)(EVP_PKEY_CTX *ctx); - int (*sign_init)(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey); + int (*sign_init)(EVP_PKEY_CTX *ctx); int (*sign)(EVP_PKEY_CTX *ctx, unsigned char *sig, int *siglen, unsigned char *tbs, int tbslen); - int (*verify_init)(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey); + int (*verify_init)(EVP_PKEY_CTX *ctx); int (*verify)(EVP_PKEY_CTX *ctx, unsigned char *sig, int siglen, unsigned char *tbs, int tbslen); - int (*verify_recover_init)(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey); + int (*verify_recover_init)(EVP_PKEY_CTX *ctx); int (*verify_recover)(EVP_PKEY_CTX *ctx, unsigned char *rout, int *routlen, unsigned char *sig, int siglen); - int (*signctx_init)(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx, - EVP_PKEY *pkey); + int (*signctx_init)(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx); int (*signctx)(EVP_PKEY_CTX *ctx, unsigned char *sig, int *siglen, EVP_MD_CTX *mctx); - int (*verifyctx_init)(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx, - EVP_PKEY *pkey); + int (*verifyctx_init)(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx); int (*verifyctx)(EVP_PKEY_CTX *ctx, unsigned char *sig, int siglen, EVP_MD_CTX *mctx); - int (*encrypt_init)(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey); + int (*encrypt_init)(EVP_PKEY_CTX *ctx); int (*encrypt)(EVP_PKEY_CTX *ctx, unsigned char *out, int *outlen, unsigned char *in, int inlen); - int (*decrypt_init)(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey); + int (*decrypt_init)(EVP_PKEY_CTX *ctx); int (*decrypt)(EVP_PKEY_CTX *ctx, unsigned char *out, int *outlen, unsigned char *in, int inlen); |