Combine oauth_hmac and oauth_plaintext into oauth_crypto.

include/oauth_test_macros.hrl

@@ -1,5 +1,5 @@
 -define(plaintext_signature_test(ConsumerSecret, TokenSecret, ExpectedSignature),
-  ?_assertEqual(ExpectedSignature, oauth_plaintext:signature(ConsumerSecret, TokenSecret))
+  ?_assertEqual(ExpectedSignature, oauth_crypto:plaintext_signature(ConsumerSecret, TokenSecret))
 ).
 
 -define(normalize_test(ExpectedString, Params),
@@ -11,5 +11,5 @@
 end).
 
 -define(hmac_signature_test(ExpectedSignature, ConsumerSecret, TokenSecret, BaseString), fun() ->
-  ?assertEqual(ExpectedSignature, oauth_hmac:signature(string:join(BaseString, []), ConsumerSecret, TokenSecret))
+  ?assertEqual(ExpectedSignature, oauth_crypto:hmac_signature(string:join(BaseString, []), ConsumerSecret, TokenSecret))
 end).

src/oauth_crypto.erl

@@ -0,0 +1,14 @@
+-module(oauth_crypto).
+
+-export([plaintext_signature/2, hmac_signature/3]).
+
+
+plaintext_signature(ConsumerSecret, TokenSecret) ->
+  Encoded = oauth_util:esprintf("%s&%s", [ConsumerSecret, TokenSecret]),
+  fmt:percent_encode(Encoded).
+
+hmac_signature(BaseString, ConsumerSecret, TokenSecret) ->
+  CS = fmt:percent_encode(ConsumerSecret),
+  TS = fmt:percent_encode(TokenSecret),
+  Key = fmt:sprintf("%s&%s", [CS, TS]),
+  base64:encode_to_string(crypto:sha_mac(Key, BaseString)).

src/oauth_hmac.erl

@@ -1,10 +0,0 @@
--module(oauth_hmac).
-
--export([signature/3]).
-
-
-signature(BaseString, ConsumerSecret, TokenSecret) ->
-  CS = fmt:percent_encode(ConsumerSecret),
-  TS = fmt:percent_encode(TokenSecret),
-  Key = fmt:sprintf("%s&%s", [CS, TS]),
-  base64:encode_to_string(crypto:sha_mac(Key, BaseString)).

src/oauth_plaintext.erl

@@ -1,8 +0,0 @@
--module(oauth_plaintext).
-
--export([signature/2]).
-
-
-signature(ConsumerSecret, TokenSecret) ->
-  Encoded = oauth_util:esprintf("%s&%s", [ConsumerSecret, TokenSecret]),
-  fmt:percent_encode(Encoded).

src/oauth_request.erl

@@ -40,10 +40,10 @@ signature(Params, Request, Consumer, TokenSecret) ->
   ConsumerSecret = oauth_consumer:secret(Consumer),
   case oauth_consumer:signature_method(Consumer) of
     "PLAINTEXT" ->
-      oauth_plaintext:signature(ConsumerSecret, TokenSecret);
+      oauth_crypto:plaintext_signature(ConsumerSecret, TokenSecret);
     "HMAC-SHA1" ->
       BaseString = oauth_base:string(method(Request), url(Request), Params),
-      oauth_hmac:signature(BaseString, ConsumerSecret, TokenSecret)
+      oauth_crypto:hmac_signature(BaseString, ConsumerSecret, TokenSecret)
   end.
 
 oauth_params(Request, Consumer, Token) ->