summaryrefslogtreecommitdiff
path: root/libnm-util/crypto.h
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2011-05-04 21:35:41 +0200
committerMichael Biebl <biebl@debian.org>2011-05-04 21:35:41 +0200
commit9f806e97a24bba61417ae312fcc0da40914266fb (patch)
tree4a25723414ceac11b4cba0558aa16f6f4b459f4b /libnm-util/crypto.h
parent8baa1aca8dfd35e3190d7d5655eb83b5b901e263 (diff)
Imported Upstream version 0.8.999upstream/0.8.999
Diffstat (limited to 'libnm-util/crypto.h')
-rw-r--r--libnm-util/crypto.h40
1 files changed, 24 insertions, 16 deletions
diff --git a/libnm-util/crypto.h b/libnm-util/crypto.h
index 38471cea6..cdf053e72 100644
--- a/libnm-util/crypto.h
+++ b/libnm-util/crypto.h
@@ -18,9 +18,12 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
- * (C) Copyright 2007 - 2008 Red Hat, Inc.
+ * (C) Copyright 2007 - 2011 Red Hat, Inc.
*/
+#ifndef __CRYPTO_H__
+#define __CRYPTO_H__
+
#include <glib.h>
#define MD5_HASH_LEN 20
@@ -51,8 +54,7 @@ enum {
typedef enum {
NM_CRYPTO_KEY_TYPE_UNKNOWN = 0,
NM_CRYPTO_KEY_TYPE_RSA,
- NM_CRYPTO_KEY_TYPE_DSA,
- NM_CRYPTO_KEY_TYPE_ENCRYPTED
+ NM_CRYPTO_KEY_TYPE_DSA
} NMCryptoKeyType;
typedef enum {
@@ -69,26 +71,31 @@ gboolean crypto_init (GError **error);
void crypto_deinit (void);
-GByteArray * crypto_get_private_key_data (GByteArray *contents,
- const char *password,
- NMCryptoKeyType *out_key_type,
- NMCryptoFileFormat *out_file_format,
- GError **error);
+GByteArray *crypto_decrypt_private_key_data (const GByteArray *contents,
+ const char *password,
+ NMCryptoKeyType *out_key_type,
+ GError **error);
-GByteArray * crypto_get_private_key (const char *file,
- const char *password,
- NMCryptoKeyType *out_key_type,
- NMCryptoFileFormat *out_file_format,
- GError **error);
+GByteArray *crypto_decrypt_private_key (const char *file,
+ const char *password,
+ NMCryptoKeyType *out_key_type,
+ GError **error);
-GByteArray * crypto_load_and_verify_certificate (const char *file,
- NMCryptoFileFormat *out_file_format,
- GError **error);
+GByteArray *crypto_load_and_verify_certificate (const char *file,
+ NMCryptoFileFormat *out_file_format,
+ GError **error);
gboolean crypto_is_pkcs12_file (const char *file, GError **error);
gboolean crypto_is_pkcs12_data (const GByteArray *data);
+NMCryptoFileFormat crypto_verify_private_key_data (const GByteArray *contents,
+ const char *password,
+ GError **error);
+
+NMCryptoFileFormat crypto_verify_private_key (const char *file,
+ const char *password,
+ GError **error);
/* Internal utils API bits for crypto providers */
@@ -129,3 +136,4 @@ gboolean crypto_verify_pkcs12 (const GByteArray *data,
const char *password,
GError **error);
+#endif /* __CRYPTO_H__ */