X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fts%2Fts.h;h=c2448e3c3be8c899f19d1983f5bfb1c3a5e15896;hp=fb352f6561d10b696b5cc9f5a961cffc6b58bc49;hb=f072785eb4de0ed808cbdf1e3004656cd26fc586;hpb=5e4430e70df0020f5f1517249851696cb9ac4ad2

diff --git a/crypto/ts/ts.h b/crypto/ts/ts.h
index fb352f6561..c2448e3c3b 100644
--- a/crypto/ts/ts.h
+++ b/crypto/ts/ts.h
@@ -86,9 +86,6 @@
 #include <openssl/dh.h>
 #endif
 
-#include <openssl/evp.h>
-
-
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -287,7 +284,7 @@ typedef struct ESS_signing_cert
 TS_REQ	*TS_REQ_new(void);
 void	TS_REQ_free(TS_REQ *a);
 int	i2d_TS_REQ(const TS_REQ *a, unsigned char **pp);
-TS_REQ	*d2i_TS_REQ(TS_REQ **a, const unsigned char **pp, size_t length);
+TS_REQ	*d2i_TS_REQ(TS_REQ **a, const unsigned char **pp, long length);
 
 TS_REQ	*TS_REQ_dup(TS_REQ *a);
 
@@ -300,7 +297,7 @@ TS_MSG_IMPRINT	*TS_MSG_IMPRINT_new(void);
 void		TS_MSG_IMPRINT_free(TS_MSG_IMPRINT *a);
 int		i2d_TS_MSG_IMPRINT(const TS_MSG_IMPRINT *a, unsigned char **pp);
 TS_MSG_IMPRINT	*d2i_TS_MSG_IMPRINT(TS_MSG_IMPRINT **a,
-				    const unsigned char **pp, size_t length);
+				    const unsigned char **pp, long length);
 
 TS_MSG_IMPRINT	*TS_MSG_IMPRINT_dup(TS_MSG_IMPRINT *a);
 
@@ -312,7 +309,7 @@ int		i2d_TS_MSG_IMPRINT_bio(BIO *fp, TS_MSG_IMPRINT *a);
 TS_RESP	*TS_RESP_new(void);
 void	TS_RESP_free(TS_RESP *a);
 int	i2d_TS_RESP(const TS_RESP *a, unsigned char **pp);
-TS_RESP	*d2i_TS_RESP(TS_RESP **a, const unsigned char **pp, size_t length);
+TS_RESP	*d2i_TS_RESP(TS_RESP **a, const unsigned char **pp, long length);
 TS_TST_INFO *PKCS7_to_TS_TST_INFO(PKCS7 *token);
 TS_RESP	*TS_RESP_dup(TS_RESP *a);
 
@@ -325,14 +322,14 @@ TS_STATUS_INFO	*TS_STATUS_INFO_new(void);
 void		TS_STATUS_INFO_free(TS_STATUS_INFO *a);
 int		i2d_TS_STATUS_INFO(const TS_STATUS_INFO *a, unsigned char **pp);
 TS_STATUS_INFO	*d2i_TS_STATUS_INFO(TS_STATUS_INFO **a, 
-				    const unsigned char **pp, size_t length);
+				    const unsigned char **pp, long length);
 TS_STATUS_INFO	*TS_STATUS_INFO_dup(TS_STATUS_INFO *a);
 
 TS_TST_INFO	*TS_TST_INFO_new(void);
 void		TS_TST_INFO_free(TS_TST_INFO *a);
 int		i2d_TS_TST_INFO(const TS_TST_INFO *a, unsigned char **pp);
 TS_TST_INFO	*d2i_TS_TST_INFO(TS_TST_INFO **a, const unsigned char **pp,
-				 size_t length);
+				    long length);
 TS_TST_INFO	*TS_TST_INFO_dup(TS_TST_INFO *a);
 
 TS_TST_INFO	*d2i_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO **a);
@@ -344,7 +341,7 @@ TS_ACCURACY	*TS_ACCURACY_new(void);
 void		TS_ACCURACY_free(TS_ACCURACY *a);
 int		i2d_TS_ACCURACY(const TS_ACCURACY *a, unsigned char **pp);
 TS_ACCURACY	*d2i_TS_ACCURACY(TS_ACCURACY **a, const unsigned char **pp,
-				 size_t length);
+				    long length);
 TS_ACCURACY	*TS_ACCURACY_dup(TS_ACCURACY *a);
 
 ESS_ISSUER_SERIAL *ESS_ISSUER_SERIAL_new(void);
@@ -352,15 +349,14 @@ void		  ESS_ISSUER_SERIAL_free(ESS_ISSUER_SERIAL *a);
 int		  i2d_ESS_ISSUER_SERIAL(const ESS_ISSUER_SERIAL *a,
 					unsigned char **pp);
 ESS_ISSUER_SERIAL *d2i_ESS_ISSUER_SERIAL(ESS_ISSUER_SERIAL **a,
-					 const unsigned char **pp,
-					 size_t length);
+					 const unsigned char **pp, long length);
 ESS_ISSUER_SERIAL *ESS_ISSUER_SERIAL_dup(ESS_ISSUER_SERIAL *a);
 
 ESS_CERT_ID	*ESS_CERT_ID_new(void);
 void		ESS_CERT_ID_free(ESS_CERT_ID *a);
 int		i2d_ESS_CERT_ID(const ESS_CERT_ID *a, unsigned char **pp);
 ESS_CERT_ID	*d2i_ESS_CERT_ID(ESS_CERT_ID **a, const unsigned char **pp,
-				 size_t length);
+				 long length);
 ESS_CERT_ID	*ESS_CERT_ID_dup(ESS_CERT_ID *a);
 
 ESS_SIGNING_CERT *ESS_SIGNING_CERT_new(void);
@@ -368,7 +364,7 @@ void		 ESS_SIGNING_CERT_free(ESS_SIGNING_CERT *a);
 int		 i2d_ESS_SIGNING_CERT(const ESS_SIGNING_CERT *a, 
 				      unsigned char **pp);
 ESS_SIGNING_CERT *d2i_ESS_SIGNING_CERT(ESS_SIGNING_CERT **a,
-				       const unsigned char **pp, size_t length);
+				       const unsigned char **pp, long length);
 ESS_SIGNING_CERT *ESS_SIGNING_CERT_dup(ESS_SIGNING_CERT *a);
 
 void ERR_load_TS_strings(void);