Formatting and spelling fixes keysync
authorDean
Tue, 04 Oct 2016 12:31:52 +0200
branchkeysync
changeset 1741fa1296363f9
parent 173 91f9ce07e831
child 175 9aabb2c9df08
Formatting and spelling fixes
CpEpEngine.cpp
pEpCOMServerAdapter.idl
     1.1 --- a/CpEpEngine.cpp	Mon Oct 03 22:16:01 2016 +0200
     1.2 +++ b/CpEpEngine.cpp	Tue Oct 04 12:31:52 2016 +0200
     1.3 @@ -472,12 +472,12 @@
     1.4  	if (!engine_version)
     1.5  		return E_INVALIDARG;
     1.6  
     1.7 -	const char *_enginge_version = ::get_engine_version();
     1.8 +	const char *_engine_version = ::get_engine_version();
     1.9  
    1.10 -	if (_enginge_version == NULL)
    1.11 +	if (_engine_version == NULL)
    1.12  		return FAIL(L"GetEngineVersion");
    1.13  
    1.14 -	*engine_version = utf16_bstr(_enginge_version);
    1.15 +	*engine_version = utf16_bstr(_engine_version);
    1.16  
    1.17  	return S_OK;
    1.18  }
     2.1 --- a/pEpCOMServerAdapter.idl	Mon Oct 03 22:16:01 2016 +0200
     2.2 +++ b/pEpCOMServerAdapter.idl	Tue Oct 04 12:31:52 2016 +0200
     2.3 @@ -126,28 +126,28 @@
     2.4          pEpCtB0rkenCrypto = 0x0b,
     2.5          pEpCtKeyTooShort = 0x0c,
     2.6  
     2.7 -        pEpCtCompromised = 0x0e,                  // known compromized connection
     2.8 -        pEpCtMistrusted = 0x0f,                   // known mistrusted key
     2.9 +        pEpCtCompromised = 0x0e,                 // known compromized connection
    2.10 +        pEpCtMistrusted = 0x0f,                  // known mistrusted key
    2.11  
    2.12          // range 0x10 to 0x3f: unconfirmed encryption
    2.13  
    2.14          pEpCtUnconfirmedEncryption = 0x10,       // generic
    2.15 -        pEpCtOpenPGPWeakUnconfirmed = 0x11,     // RSA 1024 is weak
    2.16 +        pEpCtOpenPGPWeakUnconfirmed = 0x11,      // RSA 1024 is weak
    2.17  
    2.18 -        pEpCtToBeChecked = 0x20,                // generic
    2.19 +        pEpCtToBeChecked = 0x20,                 // generic
    2.20          pEpCtSMIMEUnconfirmed = 0x21,
    2.21          pEpCtCMSUnconfirmed = 0x22,
    2.22  
    2.23 -        pEpCtStrongButUnconfirmed = 0x30,       // generic
    2.24 +        pEpCtStrongButUnconfirmed = 0x30,        // generic
    2.25          pEpCtOpenPGPUnconfirmed = 0x38,          // key at least 2048 bit RSA or EC
    2.26          pEpCtOTRUnconfirmed = 0x3a,
    2.27  
    2.28          // range 0x40 to 0x7f: unconfirmed encryption and anonymization
    2.29  
    2.30 -        pEpCtUnconfirmedEncAnon = 0x40,         // generic
    2.31 +        pEpCtUnconfirmedEncAnon = 0x40,          // generic
    2.32          pEpCtpEpUnconfirmed = 0x7f,
    2.33  
    2.34 -        pEpCtConfirmed = 0x80,                    // this bit decides if trust is confirmed
    2.35 +        pEpCtConfirmed = 0x80,                   // this bit decides if trust is confirmed
    2.36  
    2.37          // range 0x81 to 0x8f: reserved
    2.38          // range 0x90 to 0xbf: confirmed encryption
    2.39 @@ -155,17 +155,17 @@
    2.40          pEpCtConfirmedEncryption = 0x90,         // generic
    2.41          pEpCtOpenPGPWeak = 0x91,                 // RSA 1024 is weak
    2.42  
    2.43 -        pEpCtToBeCheckedConfirmed = 0xa0,      //generic
    2.44 +        pEpCtToBeCheckedConfirmed = 0xa0,        // generic
    2.45          pEpCtSMIME = 0xa1,
    2.46          pEpCtCMS = 0xa2,
    2.47  
    2.48          pEpCtStrongEncryption = 0xb0,            // generic
    2.49 -        pEpCtOpenPGP = 0xb8,                      // key at least 2048 bit RSA or EC
    2.50 +        pEpCtOpenPGP = 0xb8,                     // key at least 2048 bit RSA or EC
    2.51          pEpCtOTR = 0xba,
    2.52  
    2.53          // range 0xc0 to 0xff: confirmed encryption and anonymization
    2.54  
    2.55 -        pEpCtConfirmedEncAnon = 0xc0,           // generic
    2.56 +        pEpCtConfirmedEncAnon = 0xc0,            // generic
    2.57          pEpCtpEp = 0xff
    2.58      } pEpComType;
    2.59  
    2.60 @@ -207,6 +207,7 @@
    2.61      HRESULT BlacklistRetreive([out, retval] SAFEARRAY(BSTR) *blacklist);
    2.62  
    2.63  	// PGP compatibility functions
    2.64 +
    2.65  	HRESULT OpenPGP_list_keyinfo([in] BSTR search_pattern, [out, retval] SAFEARRAY(struct StringPair)* keyinfo_list);
    2.66  
    2.67      // Message API
    2.68 @@ -297,7 +298,6 @@
    2.69  	HRESULT ColorFromRating([in] pEpRating rating, [out, retval] pEpColor* pVal);
    2.70  
    2.71  	HRESULT RegisterCallbacks([in] IpEpEngineCallbacks* new_callback);
    2.72 -
    2.73  	HRESULT UnregisterCallbacks([in] IpEpEngineCallbacks* obsolete_callback);
    2.74  };
    2.75