projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change #include filenames from <foo.h> to <openssl.h>.
[openssl.git]
/
crypto
/
asn1
/
x_sig.c
diff --git
a/crypto/asn1/x_sig.c
b/crypto/asn1/x_sig.c
index 186c404e860454c22eb65913ebebce79c028c564..f9c2a57c0046d6dc09168536009911f0fea03b21 100644
(file)
--- a/
crypto/asn1/x_sig.c
+++ b/
crypto/asn1/x_sig.c
@@
-1,5
+1,5
@@
/* crypto/asn1/x_sig.c */
/* crypto/asn1/x_sig.c */
-/* Copyright (C) 1995-199
7
Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-199
8
Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
* This package is an SSL implementation written
* All rights reserved.
*
* This package is an SSL implementation written
@@
-58,16
+58,14
@@
#include <stdio.h>
#include "cryptlib.h"
#include <stdio.h>
#include "cryptlib.h"
-#include
"asn1_mac.h"
+#include
<openssl/asn1_mac.h>
/*
/*
- * ASN1err(ASN1_F_D2I_X509_SIG,
ASN1_R
_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_X509_SIG_NEW,
ASN1_R
_LENGTH_MISMATCH);
+ * 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
+80,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,9
+91,10
@@
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;
{
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_Malloc(ret,X509_SIG);
M_ASN1_New(ret->algor,X509_ALGOR_new);
@@
-107,8
+103,7
@@
X509_SIG *X509_SIG_new()
M_ASN1_New_Error(ASN1_F_X509_SIG_NEW);
}
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);