diff options
| author | Geoff Thorpe <geoff@openssl.org> | 2008-11-12 03:58:08 +0000 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2008-11-12 03:58:08 +0000 |
| commit | 6343829a391df59e46e513c84b6264ee71ad9518 (patch) | |
| tree | 9823103bf5828e47081ac906203516bdc332f577 /crypto/asn1/asn1_locl.h | |
| parent | 2401debe83e8df930907a39065ebf9a54354f123 (diff) | |
| download | openssl-6343829a391df59e46e513c84b6264ee71ad9518.zip openssl-6343829a391df59e46e513c84b6264ee71ad9518.tar.gz openssl-6343829a391df59e46e513c84b6264ee71ad9518.tar.bz2 | |
Revert the size_t modifications from HEAD that had led to more
knock-on work than expected - they've been extracted into a patch
series that can be completed elsewhere, or in a different branch,
before merging back to HEAD.
Diffstat (limited to 'crypto/asn1/asn1_locl.h')
| -rw-r--r-- | crypto/asn1/asn1_locl.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/asn1/asn1_locl.h b/crypto/asn1/asn1_locl.h index 9744cf6..5aa65e2 100644 --- a/crypto/asn1/asn1_locl.h +++ b/crypto/asn1/asn1_locl.h @@ -84,24 +84,24 @@ struct evp_pkey_asn1_method_st int (*pub_encode)(X509_PUBKEY *pub, const EVP_PKEY *pk); int (*pub_cmp)(const EVP_PKEY *a, const EVP_PKEY *b); int (*pub_print)(BIO *out, const EVP_PKEY *pkey, int indent, - ASN1_PCTX *pctx); + ASN1_PCTX *pctx); int (*priv_decode)(EVP_PKEY *pk, PKCS8_PRIV_KEY_INFO *p8inf); int (*priv_encode)(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk); int (*priv_print)(BIO *out, const EVP_PKEY *pkey, int indent, - ASN1_PCTX *pctx); + ASN1_PCTX *pctx); int (*pkey_size)(const EVP_PKEY *pk); int (*pkey_bits)(const EVP_PKEY *pk); int (*param_decode)(EVP_PKEY *pkey, - const unsigned char **pder, size_t derlen); + const unsigned char **pder, int derlen); int (*param_encode)(const EVP_PKEY *pkey, unsigned char **pder); int (*param_missing)(const EVP_PKEY *pk); int (*param_copy)(EVP_PKEY *to, const EVP_PKEY *from); int (*param_cmp)(const EVP_PKEY *a, const EVP_PKEY *b); int (*param_print)(BIO *out, const EVP_PKEY *pkey, int indent, - ASN1_PCTX *pctx); + ASN1_PCTX *pctx); void (*pkey_free)(EVP_PKEY *pkey); int (*pkey_ctrl)(EVP_PKEY *pkey, int op, long arg1, void *arg2); @@ -109,7 +109,7 @@ struct evp_pkey_asn1_method_st /* Legacy functions for old PEM */ int (*old_priv_decode)(EVP_PKEY *pkey, - const unsigned char **pder, size_t derlen); + const unsigned char **pder, int derlen); int (*old_priv_encode)(const EVP_PKEY *pkey, unsigned char **pder); } /* EVP_PKEY_ASN1_METHOD */; |