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/x_pubkey.c | |
| 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/x_pubkey.c')
| -rw-r--r-- | crypto/asn1/x_pubkey.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c index b087ee0..d42b6a2 100644 --- a/crypto/asn1/x_pubkey.c +++ b/crypto/asn1/x_pubkey.c @@ -187,7 +187,7 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key) */ EVP_PKEY *d2i_PUBKEY(EVP_PKEY **a, const unsigned char **pp, - size_t length) + long length) { X509_PUBKEY *xpk; EVP_PKEY *pktmp; @@ -220,7 +220,7 @@ int i2d_PUBKEY(EVP_PKEY *a, unsigned char **pp) */ #ifndef OPENSSL_NO_RSA RSA *d2i_RSA_PUBKEY(RSA **a, const unsigned char **pp, - size_t length) + long length) { EVP_PKEY *pkey; RSA *key; @@ -260,7 +260,7 @@ int i2d_RSA_PUBKEY(RSA *a, unsigned char **pp) #ifndef OPENSSL_NO_DSA DSA *d2i_DSA_PUBKEY(DSA **a, const unsigned char **pp, - size_t length) + long length) { EVP_PKEY *pkey; DSA *key; @@ -299,7 +299,7 @@ int i2d_DSA_PUBKEY(DSA *a, unsigned char **pp) #endif #ifndef OPENSSL_NO_EC -EC_KEY *d2i_EC_PUBKEY(EC_KEY **a, const unsigned char **pp, size_t length) +EC_KEY *d2i_EC_PUBKEY(EC_KEY **a, const unsigned char **pp, long length) { EVP_PKEY *pkey; EC_KEY *key; |