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/x509 | |
| parent | 2401debe83e8df930907a39065ebf9a54354f123 (diff) | |
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/x509')
| -rw-r--r-- | crypto/x509/x509.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h index ce52e00531..62e01b1ff5 100644 --- a/crypto/x509/x509.h +++ b/crypto/x509/x509.h @@ -793,21 +793,21 @@ int X509_get_pubkey_parameters(EVP_PKEY *pkey, STACK_OF(X509) *chain); int i2d_PUBKEY(EVP_PKEY *a,unsigned char **pp); EVP_PKEY * d2i_PUBKEY(EVP_PKEY **a,const unsigned char **pp, - size_t length); + long length); #ifndef OPENSSL_NO_RSA int i2d_RSA_PUBKEY(RSA *a,unsigned char **pp); RSA * d2i_RSA_PUBKEY(RSA **a,const unsigned char **pp, - size_t length); + long length); #endif #ifndef OPENSSL_NO_DSA int i2d_DSA_PUBKEY(DSA *a,unsigned char **pp); DSA * d2i_DSA_PUBKEY(DSA **a,const unsigned char **pp, - size_t length); + long length); #endif #ifndef OPENSSL_NO_EC int i2d_EC_PUBKEY(EC_KEY *a, unsigned char **pp); EC_KEY *d2i_EC_PUBKEY(EC_KEY **a, const unsigned char **pp, - size_t length); + long length); #endif DECLARE_ASN1_FUNCTIONS(X509_SIG) @@ -862,9 +862,8 @@ int X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x); X509_PKEY * X509_PKEY_new(void ); void X509_PKEY_free(X509_PKEY *a); -int i2d_X509_PKEY(X509_PKEY *a, unsigned char **pp); -X509_PKEY * d2i_X509_PKEY(X509_PKEY **a, const unsigned char **pp, - size_t length); +int i2d_X509_PKEY(X509_PKEY *a,unsigned char **pp); +X509_PKEY * d2i_X509_PKEY(X509_PKEY **a,const unsigned char **pp,long length); DECLARE_ASN1_FUNCTIONS(NETSCAPE_SPKI) DECLARE_ASN1_FUNCTIONS(NETSCAPE_SPKAC) |