projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various fixes...
[oweals/openssl.git]
/
crypto
/
asn1
/
a_sign.c
diff --git
a/crypto/asn1/a_sign.c
b/crypto/asn1/a_sign.c
index 57595692e5b965478259ae3d6aba328130423c0c..4c651706d2d6a2acfb345cb0661c2ef54fcef13a 100644
(file)
--- a/
crypto/asn1/a_sign.c
+++ b/
crypto/asn1/a_sign.c
@@
-58,10
+58,13
@@
#include <stdio.h>
#include <time.h>
#include <stdio.h>
#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include "cryptlib.h"
#include "cryptlib.h"
+
+#ifndef NO_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
#include <openssl/bn.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/bn.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
@@
-105,9
+108,9
@@
int ASN1_sign(int (*i2d)(), X509_ALGOR *algor1, X509_ALGOR *algor2,
}
}
inl=i2d(data,NULL);
}
}
inl=i2d(data,NULL);
- buf_in=(unsigned char *)
M
alloc((unsigned int)inl);
+ buf_in=(unsigned char *)
OPENSSL_m
alloc((unsigned int)inl);
outll=outl=EVP_PKEY_size(pkey);
outll=outl=EVP_PKEY_size(pkey);
- buf_out=(unsigned char *)
M
alloc((unsigned int)outl);
+ buf_out=(unsigned char *)
OPENSSL_m
alloc((unsigned int)outl);
if ((buf_in == NULL) || (buf_out == NULL))
{
outl=0;
if ((buf_in == NULL) || (buf_out == NULL))
{
outl=0;
@@
-126,11
+129,11
@@
int ASN1_sign(int (*i2d)(), X509_ALGOR *algor1, X509_ALGOR *algor2,
ASN1err(ASN1_F_ASN1_SIGN,ERR_R_EVP_LIB);
goto err;
}
ASN1err(ASN1_F_ASN1_SIGN,ERR_R_EVP_LIB);
goto err;
}
- if (signature->data != NULL)
Free((char *)
signature->data);
+ if (signature->data != NULL)
OPENSSL_free(
signature->data);
signature->data=buf_out;
buf_out=NULL;
signature->length=outl;
signature->data=buf_out;
buf_out=NULL;
signature->length=outl;
- /* In the interests of compat
a
bility, I'll make sure that
+ /* In the interests of compat
i
bility, I'll make sure that
* the bit string has a 'not-used bits' value of 0
*/
signature->flags&= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07);
* the bit string has a 'not-used bits' value of 0
*/
signature->flags&= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07);
@@
-138,8
+141,8
@@
int ASN1_sign(int (*i2d)(), X509_ALGOR *algor1, X509_ALGOR *algor2,
err:
memset(&ctx,0,sizeof(ctx));
if (buf_in != NULL)
err:
memset(&ctx,0,sizeof(ctx));
if (buf_in != NULL)
- { memset((char *)buf_in,0,(unsigned int)inl);
Free((char *)
buf_in); }
+ { memset((char *)buf_in,0,(unsigned int)inl);
OPENSSL_free(
buf_in); }
if (buf_out != NULL)
if (buf_out != NULL)
- { memset((char *)buf_out,0,outll);
Free((char *)
buf_out); }
+ { memset((char *)buf_out,0,outll);
OPENSSL_free(
buf_out); }
return(outl);
}
return(outl);
}