projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use public domain snprintf() implementation by Patrick Powell to avoid
[oweals/openssl.git]
/
crypto
/
asn1
/
x_sig.c
diff --git
a/crypto/asn1/x_sig.c
b/crypto/asn1/x_sig.c
index 245a76b0f09b76fd460baa11718eec1e70b8a04e..3559bd536853dbdc7e1c1d357c68c8e27da25e42 100644
(file)
--- a/
crypto/asn1/x_sig.c
+++ b/
crypto/asn1/x_sig.c
@@
-58,16
+58,10
@@
#include <stdio.h>
#include "cryptlib.h"
#include <stdio.h>
#include "cryptlib.h"
-#include "asn1_mac.h"
+#include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
-/*
- * ASN1err(ASN1_F_D2I_X509_SIG,ERR_R_ASN1_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_X509_SIG_NEW,ERR_R_ASN1_LENGTH_MISMATCH);
- */
-
-int i2d_X509_SIG(a,pp)
-X509_SIG *a;
-unsigned char **pp;
+int i2d_X509_SIG(X509_SIG *a, unsigned char **pp)
{
M_ASN1_I2D_vars(a);
{
M_ASN1_I2D_vars(a);
@@
-82,10
+76,7
@@
unsigned char **pp;
M_ASN1_I2D_finish();
}
M_ASN1_I2D_finish();
}
-X509_SIG *d2i_X509_SIG(a,pp,length)
-X509_SIG **a;
-unsigned char **pp;
-long length;
+X509_SIG *d2i_X509_SIG(X509_SIG **a, unsigned char **pp, long length)
{
M_ASN1_D2I_vars(a,X509_SIG *,X509_SIG_new);
{
M_ASN1_D2I_vars(a,X509_SIG *,X509_SIG_new);
@@
-96,25
+87,24
@@
long length;
M_ASN1_D2I_Finish(a,X509_SIG_free,ASN1_F_D2I_X509_SIG);
}
M_ASN1_D2I_Finish(a,X509_SIG_free,ASN1_F_D2I_X509_SIG);
}
-X509_SIG *X509_SIG_new()
+X509_SIG *X509_SIG_new(
void
)
{
X509_SIG *ret=NULL;
ASN1_CTX c;
M_ASN1_New_Malloc(ret,X509_SIG);
M_ASN1_New(ret->algor,X509_ALGOR_new);
{
X509_SIG *ret=NULL;
ASN1_CTX c;
M_ASN1_New_Malloc(ret,X509_SIG);
M_ASN1_New(ret->algor,X509_ALGOR_new);
- M_ASN1_New(ret->digest,ASN1_OCTET_STRING_new);
+ M_ASN1_New(ret->digest,
M_
ASN1_OCTET_STRING_new);
return(ret);
M_ASN1_New_Error(ASN1_F_X509_SIG_NEW);
}
return(ret);
M_ASN1_New_Error(ASN1_F_X509_SIG_NEW);
}
-void X509_SIG_free(a)
-X509_SIG *a;
+void X509_SIG_free(X509_SIG *a)
{
if (a == NULL) return;
X509_ALGOR_free(a->algor);
{
if (a == NULL) return;
X509_ALGOR_free(a->algor);
- ASN1_OCTET_STRING_free(a->digest);
- Free(
(char *)
a);
+
M_
ASN1_OCTET_STRING_free(a->digest);
+ Free(a);
}
}