projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for Win32 build.
[openssl.git]
/
crypto
/
asn1
/
asn_pack.c
diff --git
a/crypto/asn1/asn_pack.c
b/crypto/asn1/asn_pack.c
index 6e0dd9562243ec55d0a921116dcbf7095aad6eb5..bdf5f130b3a3cd0c5ad7540287ea956602cb5808 100644
(file)
--- a/
crypto/asn1/asn_pack.c
+++ b/
crypto/asn1/asn_pack.c
@@
-58,17
+58,14
@@
#include <stdio.h>
#include "cryptlib.h"
#include <stdio.h>
#include "cryptlib.h"
-#include
"asn1.h"
+#include
<openssl/asn1.h>
/* ASN1 packing and unpacking functions */
/* Turn an ASN1 encoded SEQUENCE OF into a STACK of structures */
/* ASN1 packing and unpacking functions */
/* Turn an ASN1 encoded SEQUENCE OF into a STACK of structures */
-STACK *ASN1_seq_unpack(buf, len, d2i, free_func)
-unsigned char *buf;
-int len;
-char *(*d2i)();
-void (*free_func)();
+STACK *ASN1_seq_unpack(unsigned char *buf, int len, char *(*d2i)(),
+ void (*free_func)(void *))
{
STACK *sk;
unsigned char *pbuf;
{
STACK *sk;
unsigned char *pbuf;
@@
-80,14
+77,11
@@
void (*free_func)();
}
/* Turn a STACK structures into an ASN1 encoded SEQUENCE OF structure in a
}
/* Turn a STACK structures into an ASN1 encoded SEQUENCE OF structure in a
- *
M
alloc'ed buffer
+ *
OPENSSL_m
alloc'ed buffer
*/
*/
-unsigned char *ASN1_seq_pack(safes, i2d, buf, len)
-STACK *safes;
-int (*i2d)();
-unsigned char **buf;
-int *len;
+unsigned char *ASN1_seq_pack(STACK *safes, int (*i2d)(), unsigned char **buf,
+ int *len)
{
int safelen;
unsigned char *safe, *p;
{
int safelen;
unsigned char *safe, *p;
@@
-96,7
+90,7
@@
int *len;
ASN1err(ASN1_F_ASN1_SEQ_PACK,ASN1_R_ENCODE_ERROR);
return NULL;
}
ASN1err(ASN1_F_ASN1_SEQ_PACK,ASN1_R_ENCODE_ERROR);
return NULL;
}
- if (!(safe =
M
alloc (safelen))) {
+ if (!(safe =
OPENSSL_m
alloc (safelen))) {
ASN1err(ASN1_F_ASN1_SEQ_PACK,ERR_R_MALLOC_FAILURE);
return NULL;
}
ASN1err(ASN1_F_ASN1_SEQ_PACK,ERR_R_MALLOC_FAILURE);
return NULL;
}
@@
-110,9
+104,7
@@
int *len;
/* Extract an ASN1 object from an ASN1_STRING */
/* Extract an ASN1 object from an ASN1_STRING */
-char *ASN1_unpack_string (oct, d2i)
-ASN1_STRING *oct;
-char *(*d2i)();
+void *ASN1_unpack_string (ASN1_STRING *oct, char *(*d2i)())
{
unsigned char *p;
char *ret;
{
unsigned char *p;
char *ret;
@@
-125,10
+117,7
@@
char *(*d2i)();
/* Pack an ASN1 object into an ASN1_STRING */
/* Pack an ASN1 object into an ASN1_STRING */
-ASN1_STRING *ASN1_pack_string (obj, i2d, oct)
-char *obj;
-int (*i2d)();
-ASN1_STRING **oct;
+ASN1_STRING *ASN1_pack_string (void *obj, int (*i2d)(), ASN1_STRING **oct)
{
unsigned char *p;
ASN1_STRING *octmp;
{
unsigned char *p;
ASN1_STRING *octmp;
@@
-145,7
+134,7
@@
ASN1_STRING **oct;
ASN1err(ASN1_F_ASN1_PACK_STRING,ASN1_R_ENCODE_ERROR);
return NULL;
}
ASN1err(ASN1_F_ASN1_PACK_STRING,ASN1_R_ENCODE_ERROR);
return NULL;
}
- if (!(p =
M
alloc (octmp->length))) {
+ if (!(p =
OPENSSL_m
alloc (octmp->length))) {
ASN1err(ASN1_F_ASN1_PACK_STRING,ERR_R_MALLOC_FAILURE);
return NULL;
}
ASN1err(ASN1_F_ASN1_PACK_STRING,ERR_R_MALLOC_FAILURE);
return NULL;
}