>From 15b972a13f19e766c0325cab570c88ab853a91c4 Mon Sep 17 00:00:00 2001 From: Ben Sartor Date: Thu, 15 Jan 2015 23:35:12 +0100 Subject: [PATCH 04/15] zrtp crypto types are public now --- include/bzrtp/bzrtp.h | 33 ++++++++++++++++++++++++++++++++- include/cryptoWrapper.h | 33 --------------------------------- 2 files changed, 32 insertions(+), 34 deletions(-) diff --git a/include/bzrtp/bzrtp.h b/include/bzrtp/bzrtp.h index 1b96237..190d8b7 100644 --- a/include/bzrtp/bzrtp.h +++ b/include/bzrtp/bzrtp.h @@ -33,9 +33,23 @@ #endif /** - * Some defines used internally by zrtp but also needed by client to interpretate the cipher block and auth tag algorithms used by srtp */ + * Define different types of crypto functions */ +#define ZRTP_HASH_TYPE 0x01 +#define ZRTP_CIPHERBLOCK_TYPE 0x02 +#define ZRTP_AUTHTAG_TYPE 0x04 +#define ZRTP_KEYAGREEMENT_TYPE 0x08 +#define ZRTP_SAS_TYPE 0x10 + +/** + * map the differents algorithm (some may not be available) to integer */ + #define ZRTP_UNSET_ALGO 0x00 +#define ZRTP_HASH_S256 0x11 +#define ZRTP_HASH_S384 0x12 +#define ZRTP_HASH_N256 0x13 +#define ZRTP_HASH_N384 0x14 + #define ZRTP_CIPHER_AES1 0x21 #define ZRTP_CIPHER_AES2 0x22 #define ZRTP_CIPHER_AES3 0x23 @@ -49,6 +63,23 @@ #define ZRTP_AUTHTAG_SK64 0x34 /** + * WARNING : it is very important to keep the key agreement defined in that order + * as it is used to easily sort them from faster(DH2k) to slower(EC52) + */ +#define ZRTP_KEYAGREEMENT_DH2k 0x41 +#define ZRTP_KEYAGREEMENT_EC25 0x42 +#define ZRTP_KEYAGREEMENT_DH3k 0x43 +#define ZRTP_KEYAGREEMENT_EC38 0x44 +#define ZRTP_KEYAGREEMENT_EC52 0x45 + +#define ZRTP_KEYAGREEMENT_Prsh 0x46 +#define ZRTP_KEYAGREEMENT_Mult 0x47 + +#define ZRTP_SAS_B32 0x51 +#define ZRTP_SAS_B256 0x52 + + +/** * Define to give client indication on which srtp secrets are valid when given */ #define ZRTP_SRTP_SECRETS_FOR_SENDER 0x01 diff --git a/include/cryptoWrapper.h b/include/cryptoWrapper.h index 7e713c4..2bf421d 100644 --- a/include/cryptoWrapper.h +++ b/include/cryptoWrapper.h @@ -35,39 +35,6 @@ #include #include "bzrtp/bzrtp.h" -/* define different types of crypto functions */ -#define ZRTP_HASH_TYPE 0x01 -#define ZRTP_CIPHERBLOCK_TYPE 0x02 -#define ZRTP_AUTHTAG_TYPE 0x04 -#define ZRTP_KEYAGREEMENT_TYPE 0x08 -#define ZRTP_SAS_TYPE 0x10 - -/* map the differents algorithm (some may not be available) to integer */ - -#define ZRTP_HASH_S256 0x11 -#define ZRTP_HASH_S384 0x12 -#define ZRTP_HASH_N256 0x13 -#define ZRTP_HASH_N384 0x14 - -/* - * Cipher block and Auth Tag algo are used by SRTP, so the client will need their defines - * which are in bzrtp.h */ - -/* WARNING : it is very important to keep the key agreement defined in that order - * as it is used to easily sort them from faster(DH2k) to slower(EC52) - */ -#define ZRTP_KEYAGREEMENT_DH2k 0x41 -#define ZRTP_KEYAGREEMENT_EC25 0x42 -#define ZRTP_KEYAGREEMENT_DH3k 0x43 -#define ZRTP_KEYAGREEMENT_EC38 0x44 -#define ZRTP_KEYAGREEMENT_EC52 0x45 - -#define ZRTP_KEYAGREEMENT_Prsh 0x46 -#define ZRTP_KEYAGREEMENT_Mult 0x47 - -#define ZRTP_SAS_B32 0x51 -#define ZRTP_SAS_B256 0x52 - /** * @brief Get the available crypto functions * - Hash function -- 2.1.4