ZrtpCodes.h   ZrtpCodes.h 
skipping to change at line 76 skipping to change at line 76
*/ */
enum InfoCodes { enum InfoCodes {
InfoHelloReceived = 1, //!< Hello received, preparing a Commit InfoHelloReceived = 1, //!< Hello received, preparing a Commit
InfoCommitDHGenerated, //!< Commit: Generated a public DH key InfoCommitDHGenerated, //!< Commit: Generated a public DH key
InfoRespCommitReceived, //!< Responder: Commit received, prepar ing DHPart1 InfoRespCommitReceived, //!< Responder: Commit received, prepar ing DHPart1
InfoDH1DHGenerated, //!< DH1Part: Generated a public DH key InfoDH1DHGenerated, //!< DH1Part: Generated a public DH key
InfoInitDH1Received, //!< Initiator: DHPart1 received, prepa ring DHPart2 InfoInitDH1Received, //!< Initiator: DHPart1 received, prepa ring DHPart2
InfoRespDH2Received, //!< Responder: DHPart2 received, prepa ring Confirm1 InfoRespDH2Received, //!< Responder: DHPart2 received, prepa ring Confirm1
InfoInitConf1Received, //!< Initiator: Confirm1 received, prep aring Confirm2 InfoInitConf1Received, //!< Initiator: Confirm1 received, prep aring Confirm2
InfoRespConf2Received, //!< Responder: Confirm2 received, prep aring Conf2Ack InfoRespConf2Received, //!< Responder: Confirm2 received, prep aring Conf2Ack
InfoBothRSMatch, //!< Both retained secrets match - secu rity OK InfoRSMatchFound, //!< At least one retained secrets matc hes - security OK
InfoSecureStateOn, //!< Entered secure state InfoSecureStateOn, //!< Entered secure state
InfoSecureStateOff //!< No more security for this session InfoSecureStateOff //!< No more security for this session
}; };
/** /**
* Sub-codes for Warning * Sub-codes for Warning
*/ */
enum WarningCodes { enum WarningCodes {
WarningDHAESmismatch = 1, //!< Commit contains an AES256 cipher b ut does not offer a Diffie-Helman 4096 WarningDHAESmismatch = 1, //!< Commit contains an AES256 cipher b ut does not offer a Diffie-Helman 4096
WarningGoClearReceived, //!< Received a GoClear message WarningGoClearReceived, //!< Received a GoClear message
WarningDHShort, //!< Hello offers an AES256 cipher but does not offer a Diffie-Helman 4096 WarningDHShort, //!< Hello offers an AES256 cipher but does not offer a Diffie-Helman 4096
WarningNoRSMatch, //!< No retained secret matches - verif WarningNoRSMatch, //!< No retained shared secrets availab
y SAS le - must verify SAS
WarningFirstRSMatch, //!< Only the first retained secret mat
ches - verify SAS
WarningSecondRSMatch, //!< Only the second retained secret ma
tches - verify SAS
WarningCRCmismatch, //!< Internal ZRTP packet checksum mism atch - packet dropped WarningCRCmismatch, //!< Internal ZRTP packet checksum mism atch - packet dropped
WarningSRTPauthError, //!< Dropping packet because SRTP authe ntication failed! WarningSRTPauthError, //!< Dropping packet because SRTP authe ntication failed!
WarningSRTPreplayError //!< Dropping packet because SRTP repla WarningSRTPreplayError, //!< Dropping packet because SRTP repla
y check failed! y check failed!
WarningNoExpectedRSMatch //!< Valid retained shared secrets avai
labe but no matches found - must verify SAS
}; };
/** /**
* Sub-codes for Severe * Sub-codes for Severe
*/ */
enum SevereCodes { enum SevereCodes {
SevereHelloHMACFailed = 1, //!< Hash HMAC check of Hello failed! SevereHelloHMACFailed = 1, //!< Hash HMAC check of Hello failed!
SevereCommitHMACFailed, //!< Hash HMAC check of Commit failed! SevereCommitHMACFailed, //!< Hash HMAC check of Commit failed!
SevereDH1HMACFailed, //!< Hash HMAC check of DHPart1 failed! SevereDH1HMACFailed, //!< Hash HMAC check of DHPart1 failed!
SevereDH2HMACFailed, //!< Hash HMAC check of DHPart2 failed! SevereDH2HMACFailed, //!< Hash HMAC check of DHPart2 failed!
 End of changes. 3 change blocks. 
10 lines changed or deleted 7 lines changed or added


 ZrtpQueue.h   ZrtpQueue.h 
skipping to change at line 324 skipping to change at line 324
* Request to switch off secure mode. * Request to switch off secure mode.
* *
* Call this method is the user itself wants to switch off secure * Call this method is the user itself wants to switch off secure
* mode (go clear). After sending the "go clear" request to the pee r * mode (go clear). After sending the "go clear" request to the pee r
* ZRTP immediatly switch off SRTP processing. Every RTP data is se nt * ZRTP immediatly switch off SRTP processing. Every RTP data is se nt
* in clear after the go clear request. * in clear after the go clear request.
*/ */
void requestGoClear(); void requestGoClear();
/** /**
* Set the S3 secret. * Set the auxilliary secret.
* *
* Use this method to set the srtps secret data. Refer to ZRTP * Use this method to set the srtps secret data. Refer to ZRTP
* specification, chapter 3.2.1 * specification, chapter 5.3 ff
* *
* @param data * @param data
* Points to the srtps secret data. The data must have a length * Points to the auxilliary secret data.
* of 32 bytes (length of SHA256 hash) * @param length
* Length of the auxilliary secrect in bytes
*/ */
void setS3Secret(uint8* data); void setAuxSecret(uint8_t* data, int32_t length);
/** /**
* Set the other secret. * Set the other secret.
* *
* Use this method to set the other secret data. Refer to ZRTP * Use this method to set the other secret data. Refer to ZRTP
* specification, chapter 3.2.1 * specification, chapter 5.3 ff
* *
* @param data * @param data
* Points to the other secret data. * Points to the other secret data.
* @param length * @param length
* The length in bytes of the data. * The length in bytes of the data.
*/ */
void setPbxSecret(uint8* data, int32 length); void setPbxSecret(uint8* data, int32 length);
/** /**
* Set the application's callback class. * Set the application's callback class.
 End of changes. 5 change blocks. 
6 lines changed or deleted 7 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/