Kill several defines

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
lemenkov · Oct 18, 2012 · d125173 · d125173
1 parent 9ce4d0e
commit d125173
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/include/zrtp.hrl b/include/zrtp.hrl
@@ -87,16 +87,6 @@
 -define(ZRTP_SIGNATURE_TYPE_PGP, <<"PGP ">>.).
 -define(ZRTP_SIGNATURE_TYPE_X509, <<"X509">>).
 
--define(ZRTP_SIGNATURE_HELLO, 16#505a).
-
--define(ZRTP_VERSION, "1.10").
--define(ZRTP_SOFTWARE, <<"Erlang (Z)RTPLIB">>).
-
--define(HASH_IMAGE_SIZE, 32).
-
--define(STR_INITIATOR, "Initiator").
--define(STR_RESPONDER, "Responder").
-
 -define(ZRTP_ERROR_MALFORMED_PACKET, 16#10). % Malformed packet (CRC OK, but wrong structure)
 -define(ZRTP_ERROR_SOFTWARE, 16#20). % Critical software error
 -define(ZRTP_ERROR_UNSUPPORTED_VERSION, 16#30). % Unsupported ZRTP version
@@ -125,7 +115,7 @@
 	}).
 
 -record(hello, {
-		clientid = ?ZRTP_SOFTWARE,
+		clientid = <<"Erlang (Z)RTPLIB">>,
 		h3,
 		zid,
 		s,

diff --git a/src/zrtp.erl b/src/zrtp.erl
@@ -46,6 +46,10 @@
 
 -include("../include/zrtp.hrl").
 
+-define(ZRTP_SIGNATURE_HELLO, 16#505a).
+
+-define(ZRTP_VERSION, "1.10").
+
 -record(state, {
 		parent = null,
 		zid,
@@ -227,14 +231,14 @@ handle_call(
 	Rs3 = ets:lookup_element(Tid, rs3, 2),
 	Rs4 = ets:lookup_element(Tid, rs4, 2),
 
-	<<Rs1IDi:8/binary, _/binary>> = HMacFun(Rs1, ?STR_INITIATOR),
-	<<Rs1IDr:8/binary, _/binary>> = HMacFun(Rs1, ?STR_RESPONDER),
-	<<Rs2IDi:8/binary, _/binary>> = HMacFun(Rs2, ?STR_INITIATOR),
-	<<Rs2IDr:8/binary, _/binary>> = HMacFun(Rs2, ?STR_RESPONDER),
+	<<Rs1IDi:8/binary, _/binary>> = HMacFun(Rs1, "Initiator"),
+	<<Rs1IDr:8/binary, _/binary>> = HMacFun(Rs1, "Responder"),
+	<<Rs2IDi:8/binary, _/binary>> = HMacFun(Rs2, "Initiator"),
+	<<Rs2IDr:8/binary, _/binary>> = HMacFun(Rs2, "Responder"),
 	<<AuxSecretIDi:8/binary, _/binary>> = HMacFun(Rs3, H3),
 	<<AuxSecretIDr:8/binary, _/binary>> = HMacFun(Rs3, H3),
-	<<PbxSecretIDi:8/binary, _/binary>> = HMacFun(Rs4, ?STR_INITIATOR),
-	<<PbxSecretIDr:8/binary, _/binary>> = HMacFun(Rs4, ?STR_RESPONDER),
+	<<PbxSecretIDi:8/binary, _/binary>> = HMacFun(Rs4, "Initiator"),
+	<<PbxSecretIDr:8/binary, _/binary>> = HMacFun(Rs4, "Responder"),
 
 	{PublicKey, PrivateKey} = ets:lookup_element(Tid, {pki,KeyAgr}, 2),