Move ZRTP_SRTP_HASH_SHA1

ZRTP_SRTP_HASH_SHA1 was moved from public zrtp_hash_id_t to the
private srtp implementation. HMAC SHA1 constant was also renamed to
ZRTP_SRTP_HASH_HMAC_SHA1 in order to raise an error if the user tries
to use an old ZRTP_SRTP_HASH_SHA1 constant in a ZRTP session
configuration.

include/zrtp_crypto.h

@@ -93,12 +93,7 @@ typedef enum zrtp_crypto_comp_t
 typedef enum zrtp_hash_id_t
 {	
 	ZRTP_HASH_SHA256	= 1,
-	/**
-	 * \note SHA1 hash algorithm is for internal use only! It used for srtp authentication and does
-	 * not used in ZRTP protocol itself. Don't use it in \ref zrtp_profile_t#hash_schemes configuration.
-	 */
-	ZRTP_SRTP_HASH_SHA1	= 2,
-	ZRTP_HASH_SHA384	= 3
+	ZRTP_HASH_SHA384	= 2
 } zrtp_hash_id_t;
 
 /*! Defines types of ciphers */

include/zrtp_srtp.h

@@ -32,6 +32,7 @@
 /* Special types and definitions for the embedded implementation */
 #if (!defined(ZRTP_USE_EXTERN_SRTP) || (ZRTP_USE_EXTERN_SRTP == 0))
 #include "zrtp_srtp_builtin.h"
+
 /*!
  * \brief Structure describing an SRTP session.
  * An instance of this structure is created by calling zrtp_srtp_create() 
@@ -58,6 +59,17 @@ typedef struct
 typedef void zrtp_srtp_global_t;
 #endif /* BUILDIN SRTP */
 
+/*! Defines types of SRTP hmac functions */
+typedef enum zrtp_srtp_hash_id_t
+{
+	/*!
+	 * @warning SHA1 hash algorithm is for internal use only! It used for srtp authentication and does
+	 * not used in ZRTP protocol itself. Don't use it in \ref zrtp_profile_t#hash_schemes configuration.
+	 */
+	ZRTP_SRTP_HASH_HMAC_SHA1	= 10
+} zrtp_srtp_hash_id_t;
+
+
 /*!
  * \brief Structure describing SRTP/SRTCP stream parameters.
  */

include/zrtp_version.h

@@ -13,7 +13,7 @@
 #define LIBZRTP_VERSION_MAJOR		1
 
 #define LIBZRTP_VERSION_MINOR		12
-#define LIBZRTP_VERSION_BUILD		598
-#define LIBZRTP_VERSION_STR			"v1.12 598"
+#define LIBZRTP_VERSION_BUILD		600
+#define LIBZRTP_VERSION_STR			"v1.12 600"
 
 #endif /*__ZRTP_VERSION_H__*/