projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some C compilers produce warnings or compilation errors if an attempt
[oweals/openssl.git]
/
crypto
/
asn1
/
x_pkey.c
diff --git
a/crypto/asn1/x_pkey.c
b/crypto/asn1/x_pkey.c
index 3a359cce9e36653e80c405259956638410cb2708..8453618426fbf433cba9a40731eae6233bddedee 100644
(file)
--- a/
crypto/asn1/x_pkey.c
+++ b/
crypto/asn1/x_pkey.c
@@
-58,33
+58,26
@@
#include <stdio.h>
#include "cryptlib.h"
#include <stdio.h>
#include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
-#include "asn1_mac.h"
-
-/* ASN1err(ASN1_F_D2I_X509_PKEY,ASN1_R_UNSUPPORTED_CIPHER); */
-/* ASN1err(ASN1_F_X509_PKEY_NEW,ASN1_R_IV_TOO_LARGE); */
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
/* need to implement */
/* need to implement */
-int i2d_X509_PKEY(a,pp)
-X509_PKEY *a;
-unsigned char **pp;
+int i2d_X509_PKEY(X509_PKEY *a, unsigned char **pp)
{
return(0);
}
{
return(0);
}
-X509_PKEY *d2i_X509_PKEY(a,pp,length)
-X509_PKEY **a;
-unsigned char **pp;
-long length;
+X509_PKEY *d2i_X509_PKEY(X509_PKEY **a, const unsigned char **pp, long length)
{
int i;
M_ASN1_D2I_vars(a,X509_PKEY *,X509_PKEY_new);
M_ASN1_D2I_Init();
M_ASN1_D2I_start_sequence();
{
int i;
M_ASN1_D2I_vars(a,X509_PKEY *,X509_PKEY_new);
M_ASN1_D2I_Init();
M_ASN1_D2I_start_sequence();
- M_ASN1_D2I_get
(
ret->enc_algor,d2i_X509_ALGOR);
- M_ASN1_D2I_get
(
ret->enc_pkey,d2i_ASN1_OCTET_STRING);
+ M_ASN1_D2I_get
_x(X509_ALGOR,
ret->enc_algor,d2i_X509_ALGOR);
+ M_ASN1_D2I_get
_x(ASN1_OCTET_STRING,
ret->enc_pkey,d2i_ASN1_OCTET_STRING);
ret->cipher.cipher=EVP_get_cipherbyname(
OBJ_nid2ln(OBJ_obj2nid(ret->enc_algor->algorithm)));
ret->cipher.cipher=EVP_get_cipherbyname(
OBJ_nid2ln(OBJ_obj2nid(ret->enc_algor->algorithm)));
@@
-111,7
+104,7
@@
long length;
M_ASN1_D2I_Finish(a,X509_PKEY_free,ASN1_F_D2I_X509_PKEY);
}
M_ASN1_D2I_Finish(a,X509_PKEY_free,ASN1_F_D2I_X509_PKEY);
}
-X509_PKEY *X509_PKEY_new()
+X509_PKEY *X509_PKEY_new(
void
)
{
X509_PKEY *ret=NULL;
ASN1_CTX c;
{
X509_PKEY *ret=NULL;
ASN1_CTX c;
@@
-119,7
+112,7
@@
X509_PKEY *X509_PKEY_new()
M_ASN1_New_Malloc(ret,X509_PKEY);
ret->version=0;
M_ASN1_New(ret->enc_algor,X509_ALGOR_new);
M_ASN1_New_Malloc(ret,X509_PKEY);
ret->version=0;
M_ASN1_New(ret->enc_algor,X509_ALGOR_new);
- M_ASN1_New(ret->enc_pkey,ASN1_OCTET_STRING_new);
+ M_ASN1_New(ret->enc_pkey,
M_
ASN1_OCTET_STRING_new);
ret->dec_pkey=NULL;
ret->key_length=0;
ret->key_data=NULL;
ret->dec_pkey=NULL;
ret->key_length=0;
ret->key_data=NULL;
@@
-131,8
+124,7
@@
X509_PKEY *X509_PKEY_new()
M_ASN1_New_Error(ASN1_F_X509_PKEY_NEW);
}
M_ASN1_New_Error(ASN1_F_X509_PKEY_NEW);
}
-void X509_PKEY_free(x)
-X509_PKEY *x;
+void X509_PKEY_free(X509_PKEY *x)
{
int i;
{
int i;
@@
-152,8
+144,8
@@
X509_PKEY *x;
#endif
if (x->enc_algor != NULL) X509_ALGOR_free(x->enc_algor);
#endif
if (x->enc_algor != NULL) X509_ALGOR_free(x->enc_algor);
- if (x->enc_pkey != NULL) ASN1_OCTET_STRING_free(x->enc_pkey);
+ if (x->enc_pkey != NULL)
M_
ASN1_OCTET_STRING_free(x->enc_pkey);
if (x->dec_pkey != NULL)EVP_PKEY_free(x->dec_pkey);
if (x->dec_pkey != NULL)EVP_PKEY_free(x->dec_pkey);
- if ((x->key_data != NULL) && (x->key_free))
Free((char *)
x->key_data);
-
Free((char *)(char *)
x);
+ if ((x->key_data != NULL) && (x->key_free))
OPENSSL_free(
x->key_data);
+
OPENSSL_free(
x);
}
}