diff options
| author | Robert Newson <rnewson@apache.org> | 2011-10-10 22:02:07 +0100 |
|---|---|---|
| committer | Robert Newson <rnewson@apache.org> | 2011-10-10 22:04:04 +0100 |
| commit | 1a111277d10db221d35629e1b0b9060f7ba42891 (patch) | |
| tree | 3fa8816eee1d758d4b531c35cb4bba4271cd1b4f | |
| parent | da22c19f7a7fdfae015dfb0db93b5bd9453eae6c (diff) | |
Backport erlang-oauth from master for R15 compat
| -rw-r--r-- | src/erlang-oauth/Makefile.am | 4 | ||||
| -rw-r--r-- | src/erlang-oauth/oauth.app.in | 2 | ||||
| -rw-r--r-- | src/erlang-oauth/oauth_hmac_sha1.erl | 2 | ||||
| -rw-r--r-- | src/erlang-oauth/oauth_http.erl | 2 | ||||
| -rw-r--r-- | src/erlang-oauth/oauth_plaintext.erl | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/src/erlang-oauth/Makefile.am b/src/erlang-oauth/Makefile.am index 50782e75..48b76482 100644 --- a/src/erlang-oauth/Makefile.am +++ b/src/erlang-oauth/Makefile.am @@ -22,13 +22,15 @@ oauth_file_collection = \ oauth_unix.erl \ oauth_uri.erl +# Removed oauth_rsa_sha1.beam until we require R12B5 or +# we add a ./configure option to enable it. + oauthebin_make_generated_file_list = \ oauth.app \ oauth.beam \ oauth_hmac_sha1.beam \ oauth_http.beam \ oauth_plaintext.beam \ - oauth_rsa_sha1.beam \ oauth_unix.beam \ oauth_uri.beam diff --git a/src/erlang-oauth/oauth.app.in b/src/erlang-oauth/oauth.app.in index 6357b9b0..a8ec17c4 100644 --- a/src/erlang-oauth/oauth.app.in +++ b/src/erlang-oauth/oauth.app.in @@ -1,6 +1,6 @@ {application, oauth, [ {description, "Erlang OAuth implementation"}, - {vsn, "dev"}, + {vsn, "7d85d3ef"}, {modules, [ oauth, oauth_hmac_sha1, diff --git a/src/erlang-oauth/oauth_hmac_sha1.erl b/src/erlang-oauth/oauth_hmac_sha1.erl index 79d59f37..69064edd 100644 --- a/src/erlang-oauth/oauth_hmac_sha1.erl +++ b/src/erlang-oauth/oauth_hmac_sha1.erl @@ -8,4 +8,4 @@ signature(BaseString, CS, TS) -> base64:encode_to_string(crypto:sha_mac(Key, BaseString)). verify(Signature, BaseString, CS, TS) -> - couch_util:verify(signature(BaseString, CS, TS), Signature). + Signature =:= signature(BaseString, CS, TS). diff --git a/src/erlang-oauth/oauth_http.erl b/src/erlang-oauth/oauth_http.erl index bf5a4bac..92c806cc 100644 --- a/src/erlang-oauth/oauth_http.erl +++ b/src/erlang-oauth/oauth_http.erl @@ -10,7 +10,7 @@ post(URL, Data) -> request(post, {URL, [], "application/x-www-form-urlencoded", Data}). request(Method, Request) -> - http:request(Method, Request, [{autoredirect, false}], []). + httpc:request(Method, Request, [{autoredirect, false}], []). response_params(Response) -> oauth_uri:params_from_string(response_body(Response)). diff --git a/src/erlang-oauth/oauth_plaintext.erl b/src/erlang-oauth/oauth_plaintext.erl index 41a1e9b2..d8085e02 100644 --- a/src/erlang-oauth/oauth_plaintext.erl +++ b/src/erlang-oauth/oauth_plaintext.erl @@ -7,4 +7,4 @@ signature(CS, TS) -> oauth_uri:calate("&", [CS, TS]). verify(Signature, CS, TS) -> - couch_util:verify(signature(CS, TS), Signature). + Signature =:= signature(CS, TS). |