diff options
| author | Frederic Peters <fpeters@entrouvert.com> | 2004-10-28 14:54:38 +0000 |
|---|---|---|
| committer | Frederic Peters <fpeters@entrouvert.com> | 2004-10-28 14:54:38 +0000 |
| commit | 6a1ccdf04cdc30299b3e74605d4607c8082500ff (patch) | |
| tree | b358b1d7aece35251259563844e131a4f3a4b826 | |
| parent | 50d998ebcd56c7c9e29b7bd7c8fe07fe3e05222f (diff) | |
| download | lasso-6a1ccdf04cdc30299b3e74605d4607c8082500ff.tar.gz lasso-6a1ccdf04cdc30299b3e74605d4607c8082500ff.tar.xz lasso-6a1ccdf04cdc30299b3e74605d4607c8082500ff.zip | |
style
| -rw-r--r-- | lasso/xml/tools.c | 22 | ||||
| -rw-r--r-- | lasso/xml/tools.h | 8 |
2 files changed, 14 insertions, 16 deletions
diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c index 01178a6b..e2655e21 100644 --- a/lasso/xml/tools.c +++ b/lasso/xml/tools.c @@ -140,7 +140,7 @@ lasso_get_current_time() * Return value: the pem file type **/ lassoPemFileType -lasso_get_pem_file_type(const gchar *pem_file) +lasso_get_pem_file_type(const char *pem_file) { BIO* bio; EVP_PKEY *pkey; @@ -191,7 +191,7 @@ lasso_get_pem_file_type(const gchar *pem_file) * Return value: a public key or NULL if an error occurs. **/ xmlSecKeyPtr -lasso_get_public_key_from_pem_cert_file(const gchar *pem_cert_file) +lasso_get_public_key_from_pem_cert_file(const char *pem_cert_file) { FILE *fd; X509 *pem_cert; @@ -242,7 +242,7 @@ lasso_get_public_key_from_pem_cert_file(const gchar *pem_cert_file) * Return value: a newly allocated keys manager or NULL if an error occurs. **/ xmlSecKeysMngrPtr -lasso_load_certs_from_pem_certs_chain_file(const gchar* pem_certs_chain_file) +lasso_load_certs_from_pem_certs_chain_file(const char* pem_certs_chain_file) { xmlSecKeysMngrPtr keys_mngr; GIOChannel *gioc; @@ -438,7 +438,7 @@ lasso_query_sign(xmlChar *query, * a negative value if an error occurs during verification **/ int -lasso_query_verify_signature(const gchar *query, +lasso_query_verify_signature(const char *query, const xmlChar *sender_public_key_file) { BIO *bio = NULL; @@ -548,14 +548,13 @@ lasso_query_verify_signature(const gchar *query, xmlChar* lasso_sha1(xmlChar *str) { - xmlChar *md; + xmlChar *md; - if (str != NULL) { - md = xmlMalloc(20); - return SHA1(str, strlen(str), md); - } - - return NULL; + if (str == NULL) + return NULL; + + md = xmlMalloc(20); + return SHA1(str, strlen(str), md); } char** urlencoded_to_strings(const char *str) @@ -583,4 +582,3 @@ char** urlencoded_to_strings(const char *str) return result; } - diff --git a/lasso/xml/tools.h b/lasso/xml/tools.h index ba8488a6..ba6d2fb9 100644 --- a/lasso/xml/tools.h +++ b/lasso/xml/tools.h @@ -58,16 +58,16 @@ LASSO_EXPORT xmlChar* lasso_build_unique_id (guint LASSO_EXPORT char* lasso_get_current_time(void); -LASSO_EXPORT lassoPemFileType lasso_get_pem_file_type (const gchar *pem_file); +LASSO_EXPORT lassoPemFileType lasso_get_pem_file_type (const char *pem_file); -LASSO_EXPORT xmlSecKeyPtr lasso_get_public_key_from_pem_cert_file (const gchar *pem_cert_file); +LASSO_EXPORT xmlSecKeyPtr lasso_get_public_key_from_pem_cert_file (const char *pem_cert_file); -LASSO_EXPORT xmlSecKeysMngrPtr lasso_load_certs_from_pem_certs_chain_file (const gchar* pem_certs_chain_file); +LASSO_EXPORT xmlSecKeysMngrPtr lasso_load_certs_from_pem_certs_chain_file (const char* pem_certs_chain_file); LASSO_EXPORT xmlChar* lasso_query_sign(xmlChar *query, lassoSignatureMethod sign_method, const char *private_key_file); -LASSO_EXPORT int lasso_query_verify_signature (const gchar *query, +LASSO_EXPORT int lasso_query_verify_signature (const char *query, const xmlChar *sender_public_key_file); LASSO_EXPORT xmlChar* lasso_sha1 (xmlChar *str); |