diff options
| author | Dan Winship <danw@gnome.org> | 2014-10-15 12:44:13 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-10-22 08:29:08 -0400 |
| commit | 663a06b6d9e7a45132ffadd1c41c98d86e43a5b9 (patch) | |
| tree | ac8531ce5631d42f1387d75bce99403e211fadc9 /libnm-core/crypto.h | |
| parent | 2d8e7bd2476011e7b156d6365b28a78a3ecd84bf (diff) | |
| download | NetworkManager-663a06b6d9e7a45132ffadd1c41c98d86e43a5b9.tar.gz | |
libnm-core: fix up/simplify NMCryptoError
Many of NMCryptoError's codes would basically never be useful for
programs to distinguish between. Streamline the codes, and fix the
enumeration member names to start with "NM_CRYPTO_ERROR_" rather than
"NM_CRYPTO_ERR_".
Diffstat (limited to 'libnm-core/crypto.h')
| -rw-r--r-- | libnm-core/crypto.h | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/libnm-core/crypto.h b/libnm-core/crypto.h index a530080ec6..67abbdade3 100644 --- a/libnm-core/crypto.h +++ b/libnm-core/crypto.h @@ -32,24 +32,12 @@ #define CIPHER_AES_CBC "AES-128-CBC" enum { - NM_CRYPTO_ERR_NONE = 0, - NM_CRYPTO_ERR_INIT_FAILED, - NM_CRYPTO_ERR_CANT_READ_FILE, - NM_CRYPTO_ERR_FILE_FORMAT_INVALID, - NM_CRYPTO_ERR_CERT_FORMAT_INVALID, - NM_CRYPTO_ERR_DECODE_FAILED, - NM_CRYPTO_ERR_OUT_OF_MEMORY, - NM_CRYPTO_ERR_UNKNOWN_KEY_TYPE, - NM_CRYPTO_ERR_UNKNOWN_CIPHER, - NM_CRYPTO_ERR_RAW_IV_INVALID, - NM_CRYPTO_ERR_MD5_INIT_FAILED, - NM_CRYPTO_ERR_CIPHER_INIT_FAILED, - NM_CRYPTO_ERR_CIPHER_SET_KEY_FAILED, - NM_CRYPTO_ERR_CIPHER_SET_IV_FAILED, - NM_CRYPTO_ERR_CIPHER_DECRYPT_FAILED, - NM_CRYPTO_ERR_INVALID_PASSWORD, - NM_CRYPTO_ERR_CIPHER_ENCRYPT_FAILED, - NM_CRYPTO_ERR_RANDOMIZE_FAILED + NM_CRYPTO_ERROR_FAILED = 0, + NM_CRYPTO_ERROR_INVALID_DATA, + NM_CRYPTO_ERROR_INVALID_PASSWORD, + NM_CRYPTO_ERROR_UNKNOWN_CIPHER, + NM_CRYPTO_ERROR_DECRYPTION_FAILED, + NM_CRYPTO_ERROR_ENCRYPTION_FAILED, }; typedef enum { |