From d274f9cdf3d0fe58d54f24d235c63276d4a47986 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Wed, 4 Jul 2007 17:19:14 +0000 Subject: [PATCH] Added SilcStack support to ASN.1 API and File Util API. --- lib/silccrypt/silcpk.c | 8 ++++---- lib/silccrypt/silcpkcs.c | 4 ++-- lib/silccrypt/silcpkcs1.c | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/silccrypt/silcpk.c b/lib/silccrypt/silcpk.c index c9de5492..618d1b61 100644 --- a/lib/silccrypt/silcpk.c +++ b/lib/silccrypt/silcpk.c @@ -424,7 +424,7 @@ int silc_pkcs_silc_import_public_key(unsigned char *key, if (!silc_pkcs_silc_decode_identifier(ident, &silc_pubkey->identifier)) goto err; - asn1 = silc_asn1_alloc(); + asn1 = silc_asn1_alloc(NULL); if (!asn1) goto err; @@ -615,7 +615,7 @@ unsigned char *silc_pkcs_silc_export_public_key(void *public_key, goto err; } - asn1 = silc_asn1_alloc(); + asn1 = silc_asn1_alloc(NULL); if (!asn1) goto err; @@ -1033,7 +1033,7 @@ int silc_pkcs_silc_import_private_key(unsigned char *key, if (!silc_privkey) goto err; - asn1 = silc_asn1_alloc(); + asn1 = silc_asn1_alloc(NULL); if (!asn1) goto err; @@ -1469,7 +1469,7 @@ unsigned char *silc_pkcs_silc_export_private_key(void *private_key, return NULL; silc_buffer_set(&alg_key, prv, prv_len); - asn1 = silc_asn1_alloc(); + asn1 = silc_asn1_alloc(NULL); if (!asn1) goto err; diff --git a/lib/silccrypt/silcpkcs.c b/lib/silccrypt/silcpkcs.c index 74fd6f03..7c07cfea 100644 --- a/lib/silccrypt/silcpkcs.c +++ b/lib/silccrypt/silcpkcs.c @@ -659,7 +659,7 @@ SilcBool silc_pkcs_load_public_key(const char *filename, if (!ret_public_key) return FALSE; - data = silc_file_readfile(filename, &data_len); + data = silc_file_readfile(filename, &data_len, NULL); if (!data) return FALSE; @@ -739,7 +739,7 @@ SilcBool silc_pkcs_load_private_key(const char *filename, if (!ret_private_key) return FALSE; - data = silc_file_readfile(filename, &data_len); + data = silc_file_readfile(filename, &data_len, NULL); if (!data) return FALSE; diff --git a/lib/silccrypt/silcpkcs1.c b/lib/silccrypt/silcpkcs1.c index 283f1ab3..2124d2e3 100644 --- a/lib/silccrypt/silcpkcs1.c +++ b/lib/silccrypt/silcpkcs1.c @@ -227,7 +227,7 @@ int silc_pkcs1_import_public_key(unsigned char *key, if (!ret_public_key) return 0; - asn1 = silc_asn1_alloc(); + asn1 = silc_asn1_alloc(NULL); if (!asn1) return 0; @@ -269,7 +269,7 @@ unsigned char *silc_pkcs1_export_public_key(void *public_key, SilcBufferStruct alg_key; unsigned char *ret; - asn1 = silc_asn1_alloc(); + asn1 = silc_asn1_alloc(NULL); if (!asn1) goto err; @@ -362,7 +362,7 @@ int silc_pkcs1_import_private_key(unsigned char *key, if (!ret_private_key) return 0; - asn1 = silc_asn1_alloc(); + asn1 = silc_asn1_alloc(NULL); if (!asn1) return 0; @@ -414,7 +414,7 @@ unsigned char *silc_pkcs1_export_private_key(void *private_key, SilcBufferStruct alg_key; unsigned char *ret; - asn1 = silc_asn1_alloc(); + asn1 = silc_asn1_alloc(NULL); if (!asn1) return FALSE; @@ -597,7 +597,7 @@ SilcBool silc_pkcs1_sign(void *private_key, if (!oid) return FALSE; - asn1 = silc_asn1_alloc(); + asn1 = silc_asn1_alloc(NULL); if (!asn1) return FALSE; @@ -676,7 +676,7 @@ SilcBool silc_pkcs1_verify(void *public_key, SILC_LOG_DEBUG(("Verify signature")); - asn1 = silc_asn1_alloc(); + asn1 = silc_asn1_alloc(NULL); if (!asn1) return FALSE; -- 2.24.0