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
/
x_exten.c
diff --git
a/crypto/asn1/x_exten.c
b/crypto/asn1/x_exten.c
index 89daf3f226612a51f0785a4038cc35eeb6bd23e2..fbfd963b4063900686d83fa98fdf0c75134614a9 100644
(file)
--- a/
crypto/asn1/x_exten.c
+++ b/
crypto/asn1/x_exten.c
@@
-1,5
+1,5
@@
/* crypto/asn1/x_exten.c */
/* crypto/asn1/x_exten.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,17
+58,11
@@
#include <stdio.h>
#include "cryptlib.h"
#include <stdio.h>
#include "cryptlib.h"
-#include "objects.h"
-#include "asn1_mac.h"
+#include <openssl/objects.h>
+#include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
-/*
- * ASN1err(ASN1_F_D2I_X509_EXTENSION,ASN1_R_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_X509_EXTENSION_NEW,ASN1_R_LENGTH_MISMATCH);
- */
-
-int i2d_X509_EXTENSION(a,pp)
-X509_EXTENSION *a;
-unsigned char **pp;
+int i2d_X509_EXTENSION(X509_EXTENSION *a, unsigned char **pp)
{
int k=0;
int r=0,ret=0;
{
int k=0;
int r=0,ret=0;
@@
-96,10
+90,8
@@
unsigned char **pp;
}
}
}
}
-X509_EXTENSION *d2i_X509_EXTENSION(a,pp,length)
-X509_EXTENSION **a;
-unsigned char **pp;
-long length;
+X509_EXTENSION *d2i_X509_EXTENSION(X509_EXTENSION **a, unsigned char **pp,
+ long length)
{
int i;
M_ASN1_D2I_vars(a,X509_EXTENSION *,X509_EXTENSION_new);
{
int i;
M_ASN1_D2I_vars(a,X509_EXTENSION *,X509_EXTENSION_new);
@@
-123,25
+115,25
@@
long length;
M_ASN1_D2I_Finish(a,X509_EXTENSION_free,ASN1_F_D2I_X509_EXTENSION);
}
M_ASN1_D2I_Finish(a,X509_EXTENSION_free,ASN1_F_D2I_X509_EXTENSION);
}
-X509_EXTENSION *X509_EXTENSION_new()
+X509_EXTENSION *X509_EXTENSION_new(
void
)
{
X509_EXTENSION *ret=NULL;
{
X509_EXTENSION *ret=NULL;
+ ASN1_CTX c;
M_ASN1_New_Malloc(ret,X509_EXTENSION);
M_ASN1_New_Malloc(ret,X509_EXTENSION);
-
M_ASN1_New(ret->object,ASN1_OBJECT_new
);
- M_ASN1_New(ret->value,ASN1_OCTET_STRING_new);
+
ret->object=OBJ_nid2obj(NID_undef
);
+ M_ASN1_New(ret->value,
M_
ASN1_OCTET_STRING_new);
ret->critical=0;
ret->netscape_hack=0;
return(ret);
M_ASN1_New_Error(ASN1_F_X509_EXTENSION_NEW);
}
ret->critical=0;
ret->netscape_hack=0;
return(ret);
M_ASN1_New_Error(ASN1_F_X509_EXTENSION_NEW);
}
-void X509_EXTENSION_free(a)
-X509_EXTENSION *a;
+void X509_EXTENSION_free(X509_EXTENSION *a)
{
if (a == NULL) return;
ASN1_OBJECT_free(a->object);
{
if (a == NULL) return;
ASN1_OBJECT_free(a->object);
- ASN1_OCTET_STRING_free(a->value);
-
Free((char *)
a);
+
M_
ASN1_OCTET_STRING_free(a->value);
+
OPENSSL_free(
a);
}
}