IOS-1480 Correct NS_ENUM decls. IOS-1480
authorDirk Zimmermann <dz@pep.security>
Mon, 04 Mar 2019 16:07:45 +0100
branchIOS-1480
changeset 863ab25ff826872
parent 862 af86270f362d
child 864 199da5edd943
IOS-1480 Correct NS_ENUM decls.
pEpObjCAdapterFramework/PEPEngineTypes.h
     1.1 --- a/pEpObjCAdapterFramework/PEPEngineTypes.h	Mon Mar 04 16:07:45 2019 +0100
     1.2 +++ b/pEpObjCAdapterFramework/PEPEngineTypes.h	Mon Mar 04 16:07:45 2019 +0100
     1.3 @@ -12,22 +12,22 @@
     1.4  #import <Foundation/Foundation.h>
     1.5  
     1.6  typedef NS_ENUM(NSUInteger, PEPDecryptFlags) {
     1.7 -    PEPDecryptFlagNone = 0x1, // This defined only in the adpater, not the engine.
     1.8 -    PEPDecryptFlagOwnPrivateKey = 0x1, // PEP_decrypt_flag_own_private_key = 0x1,
     1.9 -    PEPDecryptFlagConsume = 0x2, // PEP_decrypt_flag_consume = 0x2,
    1.10 -    PEPDecryptFlagIgnore = 0x4, // PEP_decrypt_flag_ignore = 0x4,
    1.11 -    PEPDecryptFlagSrcModified = 0x8, // PEP_decrypt_flag_src_modified = 0x8,
    1.12 +    PEPDecryptFlagsNone = 0x1, // This defined only in the adpater, not the engine.
    1.13 +    PEPDecryptFlagsOwnPrivateKey = 0x1, // PEP_decrypt_flag_own_private_key = 0x1,
    1.14 +    PEPDecryptFlagsConsume = 0x2, // PEP_decrypt_flag_consume = 0x2,
    1.15 +    PEPDecryptFlagsIgnore = 0x4, // PEP_decrypt_flag_ignore = 0x4,
    1.16 +    PEPDecryptFlagsSrcModified = 0x8, // PEP_decrypt_flag_src_modified = 0x8,
    1.17      // input flags
    1.18 -    PEPDecryptFlagUntrustedServer = 0x100 // PEP_decrypt_flag_untrusted_server = 0x100
    1.19 +    PEPDecryptFlagsUntrustedServer = 0x100 // PEP_decrypt_flag_untrusted_server = 0x100
    1.20  }; // PEP_decrypt_flags;
    1.21  
    1.22  typedef NS_ENUM(NSUInteger, PEPEncFormat) {
    1.23 -    PEPEncNone = 0, // PEP_enc_none = 0, // message is not encrypted
    1.24 -    PEPEncPieces, // PEP_enc_pieces, // inline PGP + PGP extensions
    1.25 -    PEPEncSMIME, // PEP_enc_S_MIME, // RFC5751
    1.26 -    PEPEncPGPMIME, // PEP_enc_PGP_MIME, // RFC3156
    1.27 -    PEPEncPEP, // PEP_enc_PEP, // pEp encryption format
    1.28 -    PEPEncPGPMIMEOutlook1 // PEP_enc_PGP_MIME_Outlook1 // Message B0rken by Outlook type 1
    1.29 +    PEPEncFormatNone = 0, // PEP_enc_none = 0, // message is not encrypted
    1.30 +    PEPEncFormatPieces, // PEP_enc_pieces, // inline PGP + PGP extensions
    1.31 +    PEPEncFormatSMIME, // PEP_enc_S_MIME, // RFC5751
    1.32 +    PEPEncFormatPgpMIME, // PEP_enc_PGP_MIME, // RFC3156
    1.33 +    PEPEncFormatPEP, // PEP_enc_PEP, // pEp encryption format
    1.34 +    PEPEncFormatPgpMIMEOutlook1 // PEP_enc_PGP_MIME_Outlook1 // Message B0rken by Outlook type 1
    1.35  };
    1.36  
    1.37  typedef NS_ENUM(NSInteger, PEPRating) {
    1.38 @@ -50,106 +50,106 @@
    1.39  typedef NS_ENUM(NSInteger, PEPStatus) {
    1.40      PEPStatusOK                                   = 0, // PEP_STATUS_OK
    1.41  
    1.42 -    PEPInitCannotLoadGPME                      = 0x0110, // PEP_INIT_CANNOT_LOAD_GPGME
    1.43 -    PEPInitGPGMEInitFailed                      = 0x0111, // PEP_INIT_GPGME_INIT_FAILED
    1.44 -    PEPInitNoGPGHome                            = 0x0112, // PEP_INIT_NO_GPG_HOME
    1.45 -    PEPInitNETPGPInitFailed                     = 0x0113, // PEP_INIT_NETPGP_INIT_FAILED
    1.46 -    PEPInitCannotDetermineGPGVersion           = 0x0114, // PEP_INIT_CANNOT_DETERMINE_GPG_VERSION
    1.47 -    PEPInitUnsupportedGPGVersion                = 0x0115, // PEP_INIT_UNSUPPORTED_GPG_VERSION
    1.48 -    PEPInitCannotConfigGPGAgent                = 0x0116, // PEP_INIT_CANNOT_CONFIG_GPG_AGENT
    1.49 +    PEPStatusInitCannotLoadGPME                      = 0x0110, // PEP_INIT_CANNOT_LOAD_GPGME
    1.50 +    PEPStatusInitGPGMEInitFailed                      = 0x0111, // PEP_INIT_GPGME_INIT_FAILED
    1.51 +    PEPStatusInitNoGPGHome                            = 0x0112, // PEP_INIT_NO_GPG_HOME
    1.52 +    PEPStatusInitNETPGPInitFailed                     = 0x0113, // PEP_INIT_NETPGP_INIT_FAILED
    1.53 +    PEPStatusInitCannotDetermineGPGVersion           = 0x0114, // PEP_INIT_CANNOT_DETERMINE_GPG_VERSION
    1.54 +    PEPStatusInitUnsupportedGPGVersion                = 0x0115, // PEP_INIT_UNSUPPORTED_GPG_VERSION
    1.55 +    PEPStatusInitCannotConfigGPGAgent                = 0x0116, // PEP_INIT_CANNOT_CONFIG_GPG_AGENT
    1.56  
    1.57 -    PEPInitSqlite3WithoutMutex                  = 0x0120, // PEP_INIT_SQLITE3_WITHOUT_MUTEX
    1.58 -    PEPInitCannotOpenDB                         = 0x0121, // PEP_INIT_CANNOT_OPEN_DB
    1.59 -    PEPInitCannotOpenSystemDB                  = 0x0122, // PEP_INIT_CANNOT_OPEN_SYSTEM_DB
    1.60 -    PEPUnknownDBError                            = 0x01ff, // PEP_UNKNOWN_DB_ERROR
    1.61 +    PEPStatusInitSqlite3WithoutMutex                  = 0x0120, // PEP_INIT_SQLITE3_WITHOUT_MUTEX
    1.62 +    PEPStatusInitCannotOpenDB                         = 0x0121, // PEP_INIT_CANNOT_OPEN_DB
    1.63 +    PEPStatusInitCannotOpenSystemDB                  = 0x0122, // PEP_INIT_CANNOT_OPEN_SYSTEM_DB
    1.64 +    PEPStatusUnknownDBError                            = 0x01ff, // PEP_UNKNOWN_DB_ERROR
    1.65  
    1.66 -    PEPKeyNotFound                               = 0x0201, // PEP_KEY_NOT_FOUND
    1.67 -    PEPKeyHasAmbigName                          = 0x0202, // PEP_KEY_HAS_AMBIG_NAME
    1.68 -    PEPGetKeyFailed                              = 0x0203, // PEP_GET_KEY_FAILED
    1.69 -    PEPCannotExportKey                           = 0x0204, // PEP_CANNOT_EXPORT_KEY
    1.70 -    PEPCannotEditKey                             = 0x0205, // PEP_CANNOT_EDIT_KEY
    1.71 -    PEPKeyUnsuitable                              = 0x0206, // PEP_KEY_UNSUITABLE
    1.72 -    PEPMalformedKeyResetMsg                     = 0x0210, // PEP_MALFORMED_KEY_RESET_MSG
    1.73 -    PEPKeyNotReset                               = 0x0211, // PEP_KEY_NOT_RESET
    1.74 +    PEPStatusKeyNotFound                               = 0x0201, // PEP_KEY_NOT_FOUND
    1.75 +    PEPStatusKeyHasAmbigName                          = 0x0202, // PEP_KEY_HAS_AMBIG_NAME
    1.76 +    PEPStatusGetKeyFailed                              = 0x0203, // PEP_GET_KEY_FAILED
    1.77 +    PEPStatusCannotExportKey                           = 0x0204, // PEP_CANNOT_EXPORT_KEY
    1.78 +    PEPStatusCannotEditKey                             = 0x0205, // PEP_CANNOT_EDIT_KEY
    1.79 +    PEPStatusKeyUnsuitable                              = 0x0206, // PEP_KEY_UNSUITABLE
    1.80 +    PEPStatusMalformedKeyResetMsg                     = 0x0210, // PEP_MALFORMED_KEY_RESET_MSG
    1.81 +    PEPStatusKeyNotReset                               = 0x0211, // PEP_KEY_NOT_RESET
    1.82  
    1.83 -    PEPKeyImported                                = 0x0220, // PEP_KEY_IMPORTED
    1.84 -    PEPNoKeyImported                             = 0x0221, // PEP_NO_KEY_IMPORTED
    1.85 -    PEPKeyImportStatusUnknown                   = 0x0222, // PEP_KEY_IMPORT_STATUS_UNKNOWN
    1.86 +    PEPStatusKeyImported                                = 0x0220, // PEP_KEY_IMPORTED
    1.87 +    PEPStatusNoKeyImported                             = 0x0221, // PEP_NO_KEY_IMPORTED
    1.88 +    PEPStatusKeyImportStatusUnknown                   = 0x0222, // PEP_KEY_IMPORT_STATUS_UNKNOWN
    1.89  
    1.90 -    PEPCannotFindIdentity                        = 0x0301, // PEP_CANNOT_FIND_IDENTITY
    1.91 -    PEPCannotSetPerson                           = 0x0381, // PEP_CANNOT_SET_PERSON
    1.92 -    PEPCannotSetPGPKeyPair                      = 0x0382, // PEP_CANNOT_SET_PGP_KEYPAIR
    1.93 -    PEPCannotSetIdentity                         = 0x0383, // PEP_CANNOT_SET_IDENTITY
    1.94 -    PEPCannotSetTrust                            = 0x0384, // PEP_CANNOT_SET_TRUST
    1.95 -    PEPKeyBlacklisted                             = 0x0385, // PEP_KEY_BLACKLISTED
    1.96 -    PEPCannotFindPerson                          = 0x0386, // PEP_CANNOT_FIND_PERSON
    1.97 +    PEPStatusCannotFindIdentity                        = 0x0301, // PEP_CANNOT_FIND_IDENTITY
    1.98 +    PEPStatusCannotSetPerson                           = 0x0381, // PEP_CANNOT_SET_PERSON
    1.99 +    PEPStatusCannotSetPGPKeyPair                      = 0x0382, // PEP_CANNOT_SET_PGP_KEYPAIR
   1.100 +    PEPStatusCannotSetIdentity                         = 0x0383, // PEP_CANNOT_SET_IDENTITY
   1.101 +    PEPStatusCannotSetTrust                            = 0x0384, // PEP_CANNOT_SET_TRUST
   1.102 +    PEPStatusKeyBlacklisted                             = 0x0385, // PEP_KEY_BLACKLISTED
   1.103 +    PEPStatusCannotFindPerson                          = 0x0386, // PEP_CANNOT_FIND_PERSON
   1.104  
   1.105 -    PEPCannotFindAlias                           = 0x0391, // PEP_CANNOT_FIND_ALIAS
   1.106 -    PEPCannotSetAlias                            = 0x0392, // PEP_CANNOT_SET_ALIAS
   1.107 +    PEPStatusCannotFindAlias                           = 0x0391, // PEP_CANNOT_FIND_ALIAS
   1.108 +    PEPStatusCannotSetAlias                            = 0x0392, // PEP_CANNOT_SET_ALIAS
   1.109  
   1.110 -    PEPUnencrypted                                 = 0x0400, // PEP_UNENCRYPTED
   1.111 -    PEPVerified                                    = 0x0401, // PEP_VERIFIED
   1.112 -    PEPDecrypted                                   = 0x0402, // PEP_DECRYPTED
   1.113 -    PEPDecryptedAndVerified                      = 0x0403, // PEP_DECRYPTED_AND_VERIFIED
   1.114 -    PEPDecryptWrongFormat                        = 0x0404, // PEP_DECRYPT_WRONG_FORMAT
   1.115 -    PEPDecryptNoKey                              = 0x0405, // PEP_DECRYPT_NO_KEY
   1.116 -    PEPDecryptSignatureDoesNotMatch            = 0x0406, // PEP_DECRYPT_SIGNATURE_DOES_NOT_MATCH
   1.117 -    PEPVerifyNoKey                               = 0x0407, // PEP_VERIFY_NO_KEY
   1.118 -    PEPVerifiedAndTrusted                        = 0x0408, // PEP_VERIFIED_AND_TRUSTED
   1.119 -    PEPCannotReencrypt                            = 0x0409, // PEP_CANNOT_REENCRYPT
   1.120 -    PEPCannotDecryptUnknown                      = 0x04ff, // PEP_CANNOT_DECRYPT_UNKNOWN
   1.121 +    PEPStatusUnencrypted                                 = 0x0400, // PEP_UNENCRYPTED
   1.122 +    PEPStatusVerified                                    = 0x0401, // PEP_VERIFIED
   1.123 +    PEPStatusDecrypted                                   = 0x0402, // PEP_DECRYPTED
   1.124 +    PEPStatusDecryptedAndVerified                      = 0x0403, // PEP_DECRYPTED_AND_VERIFIED
   1.125 +    PEPStatusDecryptWrongFormat                        = 0x0404, // PEP_DECRYPT_WRONG_FORMAT
   1.126 +    PEPStatusDecryptNoKey                              = 0x0405, // PEP_DECRYPT_NO_KEY
   1.127 +    PEPStatusDecryptSignatureDoesNotMatch            = 0x0406, // PEP_DECRYPT_SIGNATURE_DOES_NOT_MATCH
   1.128 +    PEPStatusVerifyNoKey                               = 0x0407, // PEP_VERIFY_NO_KEY
   1.129 +    PEPStatusVerifiedAndTrusted                        = 0x0408, // PEP_VERIFIED_AND_TRUSTED
   1.130 +    PEPStatusCannotReencrypt                            = 0x0409, // PEP_CANNOT_REENCRYPT
   1.131 +    PEPStatusCannotDecryptUnknown                      = 0x04ff, // PEP_CANNOT_DECRYPT_UNKNOWN
   1.132  
   1.133 -    PEPTrustwordNotFound                         = 0x0501, // PEP_TRUSTWORD_NOT_FOUND
   1.134 -    PEPTrustwordsFPRWrongLength                 = 0x0502, // PEP_TRUSTWORDS_FPR_WRONG_LENGTH
   1.135 -    PEPTrustwordsDuplicateFPR                    = 0x0503, // PEP_TRUSTWORDS_DUPLICATE_FPR
   1.136 +    PEPStatusTrustwordNotFound                         = 0x0501, // PEP_TRUSTWORD_NOT_FOUND
   1.137 +    PEPStatusTrustwordsFPRWrongLength                 = 0x0502, // PEP_TRUSTWORDS_FPR_WRONG_LENGTH
   1.138 +    PEPStatusTrustwordsDuplicateFPR                    = 0x0503, // PEP_TRUSTWORDS_DUPLICATE_FPR
   1.139  
   1.140 -    PEPCannotCreateKey                           = 0x0601, // PEP_CANNOT_CREATE_KEY
   1.141 -    PEPCannotSendKey                             = 0x0602, // PEP_CANNOT_SEND_KEY
   1.142 +    PEPStatusCannotCreateKey                           = 0x0601, // PEP_CANNOT_CREATE_KEY
   1.143 +    PEPStatusCannotSendKey                             = 0x0602, // PEP_CANNOT_SEND_KEY
   1.144  
   1.145 -    PEPPhraseNotFound                            = 0x0701, // PEP_PHRASE_NOT_FOUND
   1.146 +    PEPStatusPhraseNotFound                            = 0x0701, // PEP_PHRASE_NOT_FOUND
   1.147  
   1.148 -    PEPSendFunctionNotRegistered                = 0x0801, // PEP_SEND_FUNCTION_NOT_REGISTERED
   1.149 -    PEPConstraintsViolated                         = 0x0802, // PEP_CONTRAINTS_VIOLATED
   1.150 -    PEPCannotEncode                               = 0x0803, // PEP_CANNOT_ENCODE
   1.151 +    PEPStatusSendFunctionNotRegistered                = 0x0801, // PEP_SEND_FUNCTION_NOT_REGISTERED
   1.152 +    PEPStatusConstraintsViolated                         = 0x0802, // PEP_CONTRAINTS_VIOLATED
   1.153 +    PEPStatusCannotEncode                               = 0x0803, // PEP_CANNOT_ENCODE
   1.154  
   1.155 -    PEPSyncNoNotifyCallback                     = 0x0901, // PEP_SYNC_NO_NOTIFY_CALLBACK
   1.156 -    PEPSyncIllegalMessage                        = 0x0902, // PEP_SYNC_ILLEGAL_MESSAGE
   1.157 -    PEPSyncNoInjectCallback                     = 0x0903, // PEP_SYNC_NO_INJECT_CALLBACK
   1.158 -    PEPSyncNoChannel                             = 0x0904, // PEP_SYNC_NO_CHANNEL
   1.159 -    PEPSyncCannotEncrypt                         = 0x0905, // PEP_SYNC_CANNOT_ENCRYPT
   1.160 -    PEPSyncNoMessageSendCallback               = 0x0906, // PEP_SYNC_NO_MESSAGE_SEND_CALLBACK
   1.161 +    PEPStatusSyncNoNotifyCallback                     = 0x0901, // PEP_SYNC_NO_NOTIFY_CALLBACK
   1.162 +    PEPStatusSyncIllegalMessage                        = 0x0902, // PEP_SYNC_ILLEGAL_MESSAGE
   1.163 +    PEPStatusSyncNoInjectCallback                     = 0x0903, // PEP_SYNC_NO_INJECT_CALLBACK
   1.164 +    PEPStatusSyncNoChannel                             = 0x0904, // PEP_SYNC_NO_CHANNEL
   1.165 +    PEPStatusSyncCannotEncrypt                         = 0x0905, // PEP_SYNC_CANNOT_ENCRYPT
   1.166 +    PEPStatusSyncNoMessageSendCallback               = 0x0906, // PEP_SYNC_NO_MESSAGE_SEND_CALLBACK
   1.167  
   1.168 -    PEPCannotIncreaseSequence                    = 0x0971, // PEP_CANNOT_INCREASE_SEQUENCE
   1.169 +    PEPStatusCannotIncreaseSequence                    = 0x0971, // PEP_CANNOT_INCREASE_SEQUENCE
   1.170  
   1.171 -    PEPStatemachineError                          = 0x0980, // PEP_STATEMACHINE_ERROR
   1.172 -    PEPNoTrust                                    = 0x0981, // PEP_NO_TRUST
   1.173 -    PEPStatemachineInvalidState                  = 0x0982, // PEP_STATEMACHINE_INVALID_STATE
   1.174 -    PEPStatemachineInvalidEvent                  = 0x0983, // PEP_STATEMACHINE_INVALID_EVENT
   1.175 -    PEPStatemachineInvalidCondition              = 0x0984, // PEP_STATEMACHINE_INVALID_CONDITION
   1.176 -    PEPStatemachineInvalidAction                 = 0x0985, // PEP_STATEMACHINE_INVALID_ACTION
   1.177 -    PEPStatemachineInhibitedEvent                = 0x0986, // PEP_STATEMACHINE_INHIBITED_EVENT
   1.178 -    PEPStatemachineCannotSend                    = 0x0987, // PEP_STATEMACHINE_CANNOT_SEND
   1.179 +    PEPStatusStatemachineError                          = 0x0980, // PEP_STATEMACHINE_ERROR
   1.180 +    PEPStatusNoTrust                                    = 0x0981, // PEP_NO_TRUST
   1.181 +    PEPStatusStatemachineInvalidState                  = 0x0982, // PEP_STATEMACHINE_INVALID_STATE
   1.182 +    PEPStatusStatemachineInvalidEvent                  = 0x0983, // PEP_STATEMACHINE_INVALID_EVENT
   1.183 +    PEPStatusStatemachineInvalidCondition              = 0x0984, // PEP_STATEMACHINE_INVALID_CONDITION
   1.184 +    PEPStatusStatemachineInvalidAction                 = 0x0985, // PEP_STATEMACHINE_INVALID_ACTION
   1.185 +    PEPStatusStatemachineInhibitedEvent                = 0x0986, // PEP_STATEMACHINE_INHIBITED_EVENT
   1.186 +    PEPStatusStatemachineCannotSend                    = 0x0987, // PEP_STATEMACHINE_CANNOT_SEND
   1.187  
   1.188 -    PEPCommitFailed                               = 0xff01, // PEP_COMMIT_FAILED
   1.189 -    PEPMessageConsume                             = 0xff02, // PEP_MESSAGE_CONSUME
   1.190 -    PEPMessageIgnore                              = 0xff03, // PEP_MESSAGE_IGNORE
   1.191 +    PEPStatusCommitFailed                               = 0xff01, // PEP_COMMIT_FAILED
   1.192 +    PEPStatusMessageConsume                             = 0xff02, // PEP_MESSAGE_CONSUME
   1.193 +    PEPStatusMessageIgnore                              = 0xff03, // PEP_MESSAGE_IGNORE
   1.194  
   1.195 -    PEPRecordNotFound                            = -6, // PEP_RECORD_NOT_FOUND
   1.196 -    PEPCannotCreateTempFile                     = -5, // PEP_CANNOT_CREATE_TEMP_FILE
   1.197 -    PEPIllegalValue                               = -4, // PEP_ILLEGAL_VALUE
   1.198 -    PEPBufferTooSmall                            = -3, // PEP_BUFFER_TOO_SMALL
   1.199 -    PEPOutOfMemory                               = -2, // PEP_OUT_OF_MEMORY
   1.200 -    PEPUnknownError                               = -1, // PEP_UNKNOWN_ERROR
   1.201 +    PEPStatusRecordNotFound                            = -6, // PEP_RECORD_NOT_FOUND
   1.202 +    PEPStatusCannotCreateTempFile                     = -5, // PEP_CANNOT_CREATE_TEMP_FILE
   1.203 +    PEPStatusIllegalValue                               = -4, // PEP_ILLEGAL_VALUE
   1.204 +    PEPStatusBufferTooSmall                            = -3, // PEP_BUFFER_TOO_SMALL
   1.205 +    PEPStatusOutOfMemory                               = -2, // PEP_OUT_OF_MEMORY
   1.206 +    PEPStatusUnknownError                               = -1, // PEP_UNKNOWN_ERROR
   1.207  
   1.208 -    PEPVersionMismatch                            = -7, // PEP_VERSION_MISMATCH
   1.209 +    PEPStatusVersionMismatch                            = -7, // PEP_VERSION_MISMATCH
   1.210  };
   1.211  
   1.212  typedef NS_ENUM(NSUInteger, PEPIdentityFlags) {
   1.213      // the first octet flags are app defined settings
   1.214 -    PEPIdfNotForSync = 0x0001, // PEP_idf_not_for_sync = 0x0001,   // don't use this identity for sync
   1.215 -    PEPIdfList = 0x0002, // PEP_idf_list = 0x0002,           // identity of list of persons
   1.216 +    PEPIdentityFlagsNotForSync = 0x0001, // PEP_idf_not_for_sync = 0x0001,   // don't use this identity for sync
   1.217 +    PEPIdentityFlagsList = 0x0002, // PEP_idf_list = 0x0002,           // identity of list of persons
   1.218      // the second octet flags are calculated
   1.219 -    PEPIdfDeviceGroup = 0x0100 // PEP_idf_devicegroup = 0x0100     // identity of a device group member
   1.220 +    PEPIdentityFlagsDeviceGroup = 0x0100 // PEP_idf_devicegroup = 0x0100     // identity of a device group member
   1.221  };
   1.222  
   1.223  typedef NS_ENUM(NSInteger, PEPSyncHandshakeResult) {
   1.224 @@ -159,69 +159,69 @@
   1.225  };
   1.226  
   1.227  typedef NS_ENUM(NSUInteger, PEPCommType) {
   1.228 -    PEPCtUnknown = 0, // PEP_ct_unknown = 0,
   1.229 +    PEPCommTypeUnknown = 0, // PEP_ct_unknown = 0,
   1.230  
   1.231      // range 0x01 to 0x09: no encryption, 0x0a to 0x0e: nothing reasonable
   1.232  
   1.233 -    PEPCtNoEncryption = 0x01, // PEP_ct_no_encryption = 0x01,                // generic
   1.234 -    PEPCtNoEncrypted_channel = 0x02, // PEP_ct_no_encrypted_channel = 0x02,
   1.235 -    PEPCtKeyNotFound = 0x03, // PEP_ct_key_not_found = 0x03,
   1.236 -    PEPCtKeyExpired = 0x04, // PEP_ct_key_expired = 0x04,
   1.237 -    PEPCtKeyRevoked = 0x05, // PEP_ct_key_revoked = 0x05,
   1.238 -    PEPCtKeyBr0ken = 0x06, // PEP_ct_key_b0rken = 0x06,
   1.239 -    PEPCtKeyExpiredButConfirmed = 0x07, // PEP_ct_key_expired_but_confirmed = 0x07, // NOT with confirmed bit. Just retaining info here in case of renewal.
   1.240 -    PEPCtMyKeyNotIncluded = 0x09, // PEP_ct_my_key_not_included = 0x09,
   1.241 +    PEPCommTypeNoEncryption = 0x01, // PEP_ct_no_encryption = 0x01,                // generic
   1.242 +    PEPCommTypeNoEncrypted_channel = 0x02, // PEP_ct_no_encrypted_channel = 0x02,
   1.243 +    PEPCommTypeKeyNotFound = 0x03, // PEP_ct_key_not_found = 0x03,
   1.244 +    PEPCommTypeKeyExpired = 0x04, // PEP_ct_key_expired = 0x04,
   1.245 +    PEPCommTypeKeyRevoked = 0x05, // PEP_ct_key_revoked = 0x05,
   1.246 +    PEPCommTypeKeyBr0ken = 0x06, // PEP_ct_key_b0rken = 0x06,
   1.247 +    PEPCommTypeKeyExpiredButConfirmed = 0x07, // PEP_ct_key_expired_but_confirmed = 0x07, // NOT with confirmed bit. Just retaining info here in case of renewal.
   1.248 +    PEPCommTypeMyKeyNotIncluded = 0x09, // PEP_ct_my_key_not_included = 0x09,
   1.249  
   1.250 -    PEPCtSecurityByObscurity = 0x0a, // PEP_ct_security_by_obscurity = 0x0a,
   1.251 -    PEPCtBr0kenCrypto = 0x0b, // PEP_ct_b0rken_crypto = 0x0b,
   1.252 -    PEPCtKeyTooShort = 0x0c, // PEP_ct_key_too_short = 0x0c,
   1.253 +    PEPCommTypeSecurityByObscurity = 0x0a, // PEP_ct_security_by_obscurity = 0x0a,
   1.254 +    PEPCommTypeBr0kenCrypto = 0x0b, // PEP_ct_b0rken_crypto = 0x0b,
   1.255 +    PEPCommTypeKeyTooShort = 0x0c, // PEP_ct_key_too_short = 0x0c,
   1.256  
   1.257 -    PEPCtCompromised = 0x0e, // PEP_ct_compromized = 0x0e,                  // deprecated misspelling
   1.258 -    PEPCtMistrusted = 0x0f, // PEP_ct_mistrusted = 0x0f,                   // known mistrusted key
   1.259 +    PEPCommTypeCompromised = 0x0e, // PEP_ct_compromized = 0x0e,                  // deprecated misspelling
   1.260 +    PEPCommTypeMistrusted = 0x0f, // PEP_ct_mistrusted = 0x0f,                   // known mistrusted key
   1.261  
   1.262      // range 0x10 to 0x3f: unconfirmed encryption
   1.263  
   1.264 -    PEPCtUnconfirmedEncryption = 0x10, // PEP_ct_unconfirmed_encryption = 0x10,       // generic
   1.265 -    PEPCtOpenPGPWeakUnconfirmed = 0x11, // PEP_ct_OpenPGP_weak_unconfirmed = 0x11,     // RSA 1024 is weak
   1.266 +    PEPCommTypeUnconfirmedEncryption = 0x10, // PEP_ct_unconfirmed_encryption = 0x10,       // generic
   1.267 +    PEPCommTypeOpenPGPWeakUnconfirmed = 0x11, // PEP_ct_OpenPGP_weak_unconfirmed = 0x11,     // RSA 1024 is weak
   1.268  
   1.269 -    PEPCtToBeChecked = 0x20, // PEP_ct_to_be_checked = 0x20,                // generic
   1.270 -    PEPCtSMIMEUnconfirmed = 0x21, // PEP_ct_SMIME_unconfirmed = 0x21,
   1.271 -    PEPCtCMSUnconfirmed = 0x22, // PEP_ct_CMS_unconfirmed = 0x22,
   1.272 +    PEPCommTypeToBeChecked = 0x20, // PEP_ct_to_be_checked = 0x20,                // generic
   1.273 +    PEPCommTypeSMIMEUnconfirmed = 0x21, // PEP_ct_SMIME_unconfirmed = 0x21,
   1.274 +    PEPCommTypeCMSUnconfirmed = 0x22, // PEP_ct_CMS_unconfirmed = 0x22,
   1.275  
   1.276 -    PEPCtStongButUnconfirmed = 0x30, // PEP_ct_strong_but_unconfirmed = 0x30,       // generic
   1.277 -    PEPCtOpenPGPUnconfirmed = 0x38, // PEP_ct_OpenPGP_unconfirmed = 0x38,          // key at least 2048 bit RSA or EC
   1.278 -    PEPCtOTRUnconfirmed = 0x3a, // PEP_ct_OTR_unconfirmed = 0x3a,
   1.279 +    PEPCommTypeStongButUnconfirmed = 0x30, // PEP_ct_strong_but_unconfirmed = 0x30,       // generic
   1.280 +    PEPCommTypeOpenPGPUnconfirmed = 0x38, // PEP_ct_OpenPGP_unconfirmed = 0x38,          // key at least 2048 bit RSA or EC
   1.281 +    PEPCommTypeOTRUnconfirmed = 0x3a, // PEP_ct_OTR_unconfirmed = 0x3a,
   1.282  
   1.283      // range 0x40 to 0x7f: unconfirmed encryption and anonymization
   1.284  
   1.285 -    PEPCtUnconfirmedEncAnon = 0x40, // PEP_ct_unconfirmed_enc_anon = 0x40,         // generic
   1.286 -    PEPCtPEPUnconfirmed = 0x7f, // PEP_ct_pEp_unconfirmed = 0x7f,
   1.287 +    PEPCommTypeUnconfirmedEncAnon = 0x40, // PEP_ct_unconfirmed_enc_anon = 0x40,         // generic
   1.288 +    PEPCommTypePEPUnconfirmed = 0x7f, // PEP_ct_pEp_unconfirmed = 0x7f,
   1.289  
   1.290 -    PEPCtConfirmed = 0x80, // PEP_ct_confirmed = 0x80,                    // this bit decides if trust is confirmed
   1.291 +    PEPCommTypeConfirmed = 0x80, // PEP_ct_confirmed = 0x80,                    // this bit decides if trust is confirmed
   1.292  
   1.293      // range 0x81 to 0x8f: reserved
   1.294      // range 0x90 to 0xbf: confirmed encryption
   1.295  
   1.296 -    PEPCtConfirmedEncryption = 0x90, // PEP_ct_confirmed_encryption = 0x90,         // generic
   1.297 -    PEPCtOpenPGPWeak = 0x91, // PEP_ct_OpenPGP_weak = 0x91,                 // RSA 1024 is weak (unused)
   1.298 +    PEPCommTypeConfirmedEncryption = 0x90, // PEP_ct_confirmed_encryption = 0x90,         // generic
   1.299 +    PEPCommTypeOpenPGPWeak = 0x91, // PEP_ct_OpenPGP_weak = 0x91,                 // RSA 1024 is weak (unused)
   1.300  
   1.301 -    PEPCtToBeCheckedConfirmed = 0xa0, // PEP_ct_to_be_checked_confirmed = 0xa0,      // generic
   1.302 -    PEPCtSMIME = 0xa1, // PEP_ct_SMIME = 0xa1,
   1.303 -    PEPCtCMS = 0xa2, // PEP_ct_CMS = 0xa2,
   1.304 +    PEPCommTypeToBeCheckedConfirmed = 0xa0, // PEP_ct_to_be_checked_confirmed = 0xa0,      // generic
   1.305 +    PEPCommTypeSMIME = 0xa1, // PEP_ct_SMIME = 0xa1,
   1.306 +    PEPCommTypeCMS = 0xa2, // PEP_ct_CMS = 0xa2,
   1.307  
   1.308 -    PEPCtStongEncryption = 0xb0, // PEP_ct_strong_encryption = 0xb0,            // generic
   1.309 -    PEPCtOpenPGP = 0xb8, // PEP_ct_OpenPGP = 0xb8,                      // key at least 2048 bit RSA or EC
   1.310 -    PEPCtOTR = 0xba, // PEP_ct_OTR = 0xba,
   1.311 +    PEPCommTypeStongEncryption = 0xb0, // PEP_ct_strong_encryption = 0xb0,            // generic
   1.312 +    PEPCommTypeOpenPGP = 0xb8, // PEP_ct_OpenPGP = 0xb8,                      // key at least 2048 bit RSA or EC
   1.313 +    PEPCommTypeOTR = 0xba, // PEP_ct_OTR = 0xba,
   1.314  
   1.315      // range 0xc0 to 0xff: confirmed encryption and anonymization
   1.316  
   1.317 -    PEPCtConfirmedEncAnon = 0xc0, // PEP_ct_confirmed_enc_anon = 0xc0,           // generic
   1.318 -    PEPCtPEP = 0xff // PEP_ct_pEp = 0xff
   1.319 +    PEPCommTypeConfirmedEncAnon = 0xc0, // PEP_ct_confirmed_enc_anon = 0xc0,           // generic
   1.320 +    PEPCommTypePEP = 0xff // PEP_ct_pEp = 0xff
   1.321  };
   1.322  
   1.323  typedef NS_ENUM(NSUInteger, PEPMsgDirection) {
   1.324 -    PEPDirIncoming = 0,
   1.325 -    PEPDirOutgoing
   1.326 +    PEPMsgDirectionIncoming = 0,
   1.327 +    PEPMsgDirectionOutgoing
   1.328  };
   1.329  
   1.330  typedef NS_ENUM(NSInteger, PEPColor) {
   1.331 @@ -232,9 +232,9 @@
   1.332  };
   1.333  
   1.334  typedef NS_ENUM(NSInteger, PEPContentDisposition) {
   1.335 -    PEPContentDispAttachment = 0,
   1.336 -    PEPContentDispInline = 1,
   1.337 -    PEPContentDispOther = -1      // must be affirmatively set
   1.338 +    PEPContentDispositionAttachment = 0,
   1.339 +    PEPContentDispositionInline = 1,
   1.340 +    PEPContentDispositionOther = -1      // must be affirmatively set
   1.341  };
   1.342  
   1.343  #endif /* PEPTypes_h */