From caab726e7b02b592712eeaec5c3b7667dd0fd876 Mon Sep 17 00:00:00 2001 From: Damien Stuart Date: Sun, 7 Jun 2009 20:02:14 +0000 Subject: [PATCH] Brought Error constants in sync with libfko. git-svn-id: file:///home/mbr/svn/fwknop/trunk@99 510a4753-2344-4c79-9c09-4d669213fbeb --- perl/FKO/lib/FKO_Constants.pl | 98 +++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 46 deletions(-) diff --git a/perl/FKO/lib/FKO_Constants.pl b/perl/FKO/lib/FKO_Constants.pl index df22ba24..ef53e7c3 100644 --- a/perl/FKO/lib/FKO_Constants.pl +++ b/perl/FKO/lib/FKO_Constants.pl @@ -80,6 +80,9 @@ our @ERROR_CODES = qw( FKO_ERROR_GPGME_DECRYPT_FAILED FKO_ERROR_GPGME_BAD_HOME_DIR FKO_ERROR_GPGME_SET_HOME_DIR + FKO_ERROR_GPGME_NO_SIGNATURE + FKO_ERROR_GPGME_BAD_SIGNATURE + FKO_ERROR_GPGME_SIGNATURE_VERIFY_DISABLED ); # The FKO constants. These are manually pulled from fko.h (for now). @@ -95,57 +98,60 @@ use constant { FKO_CLIENT_TIMEOUT_LOCAL_NAT_ACCESS_MSG => 6, # Digest types - FKO_DIGEST_MD5 => 1, - FKO_DIGEST_SHA1 => 2, - FKO_DIGEST_SHA256 => 3, + FKO_DIGEST_MD5 => 1, + FKO_DIGEST_SHA1 => 2, + FKO_DIGEST_SHA256 => 3, # Encryption types - FKO_ENCRYPTION_RIJNDAEL => 1, - FKO_ENCRYPTION_GPG => 2, + FKO_ENCRYPTION_RIJNDAEL => 1, + FKO_ENCRYPTION_GPG => 2, # FKO error codes - FKO_SUCCESS => 0, - FKO_ERROR_CTX_NOT_INITIALIZED => 1, - FKO_ERROR_MEMORY_ALLOCATION => 2, - FKO_ERROR_INVALID_DATA => 3, - FKO_ERROR_DATA_TOO_LARGE => 4, - FKO_ERROR_USERNAME_UNKNOWN => 5, - FKO_ERROR_INCOMPLETE_SPA_DATA => 6, - FKO_ERROR_MISSING_ENCODED_DATA => 7, - FKO_ERROR_INVALID_DIGEST_TYPE => 8, - FKO_ERROR_INVALID_ALLOW_IP => 9, - FKO_ERROR_INVALID_SPA_COMMAND_MSG => 10, - FKO_ERROR_INVALID_SPA_ACCESS_MSG => 11, - FKO_ERROR_INVALID_SPA_NAT_ACCESS_MSG => 12, - FKO_ERROR_INVALID_ENCRYPTION_TYPE => 13, - FKO_ERROR_WRONG_ENCRYPTION_TYPE => 14, - FKO_ERROR_DECRYPTION_SIZE => 15, - FKO_ERROR_DECRYPTION_FAILURE => 16, - FKO_ERROR_DIGEST_VERIFICATION_FAILED => 17, - FKO_ERROR_UNSUPPORTED_FEATURE => 18, - FKO_ERROR_UNKNOWN => 19, + FKO_SUCCESS => 0, + FKO_ERROR_CTX_NOT_INITIALIZED => 1, + FKO_ERROR_MEMORY_ALLOCATION => 2, + FKO_ERROR_INVALID_DATA => 3, + FKO_ERROR_DATA_TOO_LARGE => 4, + FKO_ERROR_USERNAME_UNKNOWN => 5, + FKO_ERROR_INCOMPLETE_SPA_DATA => 6, + FKO_ERROR_MISSING_ENCODED_DATA => 7, + FKO_ERROR_INVALID_DIGEST_TYPE => 8, + FKO_ERROR_INVALID_ALLOW_IP => 9, + FKO_ERROR_INVALID_SPA_COMMAND_MSG => 10, + FKO_ERROR_INVALID_SPA_ACCESS_MSG => 11, + FKO_ERROR_INVALID_SPA_NAT_ACCESS_MSG => 12, + FKO_ERROR_INVALID_ENCRYPTION_TYPE => 13, + FKO_ERROR_WRONG_ENCRYPTION_TYPE => 14, + FKO_ERROR_DECRYPTION_SIZE => 15, + FKO_ERROR_DECRYPTION_FAILURE => 16, + FKO_ERROR_DIGEST_VERIFICATION_FAILED => 17, + FKO_ERROR_UNSUPPORTED_FEATURE => 18, + FKO_ERROR_UNKNOWN => 19, # Start GPGME-related errors - GPGME_ERR_START => 20, - FKO_ERROR_MISSING_GPG_KEY_DATA => 21, - FKO_ERROR_GPGME_NO_OPENPGP => 22, - FKO_ERROR_GPGME_CONTEXT => 23, - FKO_ERROR_GPGME_PLAINTEXT_DATA_OBJ => 24, - FKO_ERROR_GPGME_SET_PROTOCOL => 25, - FKO_ERROR_GPGME_CIPHER_DATA_OBJ => 26, - FKO_ERROR_GPGME_BAD_PASSPHRASE => 27, - FKO_ERROR_GPGME_ENCRYPT_SIGN => 28, - FKO_ERROR_GPGME_CONTEXT_SIGNER_KEY => 29, - FKO_ERROR_GPGME_SIGNER_KEYLIST_START => 30, - FKO_ERROR_GPGME_SIGNER_KEY_NOT_FOUND => 31, - FKO_ERROR_GPGME_SIGNER_KEY_AMBIGUOUS => 32, - FKO_ERROR_GPGME_ADD_SIGNER => 33, - FKO_ERROR_GPGME_CONTEXT_RECIPIENT_KEY => 34, - FKO_ERROR_GPGME_RECIPIENT_KEYLIST_START => 35, - FKO_ERROR_GPGME_RECIPIENT_KEY_NOT_FOUND => 36, - FKO_ERROR_GPGME_RECIPIENT_KEY_AMBIGUOUS => 37, - FKO_ERROR_GPGME_DECRYPT_FAILED => 38, - FKO_ERROR_GPGME_BAD_HOME_DIR => 39, - FKO_ERROR_GPGME_SET_HOME_DIR => 40, + GPGME_ERR_START => 20, + FKO_ERROR_MISSING_GPG_KEY_DATA => 21, + FKO_ERROR_GPGME_NO_OPENPGP => 22, + FKO_ERROR_GPGME_CONTEXT => 23, + FKO_ERROR_GPGME_PLAINTEXT_DATA_OBJ => 24, + FKO_ERROR_GPGME_SET_PROTOCOL => 25, + FKO_ERROR_GPGME_CIPHER_DATA_OBJ => 26, + FKO_ERROR_GPGME_BAD_PASSPHRASE => 27, + FKO_ERROR_GPGME_ENCRYPT_SIGN => 28, + FKO_ERROR_GPGME_CONTEXT_SIGNER_KEY => 29, + FKO_ERROR_GPGME_SIGNER_KEYLIST_START => 30, + FKO_ERROR_GPGME_SIGNER_KEY_NOT_FOUND => 31, + FKO_ERROR_GPGME_SIGNER_KEY_AMBIGUOUS => 32, + FKO_ERROR_GPGME_ADD_SIGNER => 33, + FKO_ERROR_GPGME_CONTEXT_RECIPIENT_KEY => 34, + FKO_ERROR_GPGME_RECIPIENT_KEYLIST_START => 35, + FKO_ERROR_GPGME_RECIPIENT_KEY_NOT_FOUND => 36, + FKO_ERROR_GPGME_RECIPIENT_KEY_AMBIGUOUS => 37, + FKO_ERROR_GPGME_DECRYPT_FAILED => 38, + FKO_ERROR_GPGME_BAD_HOME_DIR => 39, + FKO_ERROR_GPGME_SET_HOME_DIR => 40, + FKO_ERROR_GPGME_NO_SIGNATURE => 41, + FKO_ERROR_GPGME_BAD_SIGNATURE => 42, + FKO_ERROR_GPGME_SIGNATURE_VERIFY_DISABLED => 43, }; 1;