-rw-r--r-- | lib/consumer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc index dc49405..30a5507 100644 --- a/lib/consumer.cc +++ b/lib/consumer.cc | |||
@@ -12,65 +12,65 @@ | |||
12 | #include <iostream> | 12 | #include <iostream> |
13 | 13 | ||
14 | #include "config.h" | 14 | #include "config.h" |
15 | 15 | ||
16 | namespace opkele { | 16 | namespace opkele { |
17 | using namespace std; | 17 | using namespace std; |
18 | 18 | ||
19 | class curl_t { | 19 | class curl_t { |
20 | public: | 20 | public: |
21 | CURL *_c; | 21 | CURL *_c; |
22 | 22 | ||
23 | curl_t() : _c(0) { } | 23 | curl_t() : _c(0) { } |
24 | curl_t(CURL *c) : _c(c) { } | 24 | curl_t(CURL *c) : _c(c) { } |
25 | ~curl_t() throw() { if(_c) curl_easy_cleanup(_c); } | 25 | ~curl_t() throw() { if(_c) curl_easy_cleanup(_c); } |
26 | 26 | ||
27 | curl_t& operator=(CURL *c) { if(_c) curl_easy_cleanup(_c); _c=c; return *this; } | 27 | curl_t& operator=(CURL *c) { if(_c) curl_easy_cleanup(_c); _c=c; return *this; } |
28 | 28 | ||
29 | operator const CURL*(void) const { return _c; } | 29 | operator const CURL*(void) const { return _c; } |
30 | operator CURL*(void) { return _c; } | 30 | operator CURL*(void) { return _c; } |
31 | }; | 31 | }; |
32 | 32 | ||
33 | static CURLcode curl_misc_sets(CURL* c) { | 33 | static CURLcode curl_misc_sets(CURL* c) { |
34 | CURLcode r; | 34 | CURLcode r; |
35 | (r=curl_easy_setopt(c,CURLOPT_FOLLOWLOCATION,1)) | 35 | (r=curl_easy_setopt(c,CURLOPT_FOLLOWLOCATION,1)) |
36 | || (r=curl_easy_setopt(c,CURLOPT_MAXREDIRS,5)) | 36 | || (r=curl_easy_setopt(c,CURLOPT_MAXREDIRS,5)) |
37 | || (r=curl_easy_setopt(c,CURLOPT_DNS_CACHE_TIMEOUT,120)) | 37 | || (r=curl_easy_setopt(c,CURLOPT_DNS_CACHE_TIMEOUT,120)) |
38 | || (r=curl_easy_setopt(c,CURLOPT_DNS_USE_GLOBAL_CACHE,1)) | 38 | || (r=curl_easy_setopt(c,CURLOPT_DNS_USE_GLOBAL_CACHE,1)) |
39 | || (r=curl_easy_setopt(c,CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_VERSION)) | 39 | || (r=curl_easy_setopt(c,CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_VERSION)) |
40 | || (r=curl_easy_setopt(c,CURLOPT_TIMEOUT,20)) | 40 | || (r=curl_easy_setopt(c,CURLOPT_TIMEOUT,20)) |
41 | #ifdefDISABLE_CURL_SSL_VERIFYHOST | 41 | #ifdefDISABLE_CURL_SSL_VERIFYHOST |
42 | || (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYHOST,0)) | 42 | || (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYHOST,0)) |
43 | #endif | 43 | #endif |
44 | #ifdefDISABLE_CURL_SSL_VERYPEER | 44 | #ifdefDISABLE_CURL_SSL_VERIFYPEER |
45 | || (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYPEER,0)) | 45 | || (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYPEER,0)) |
46 | #endif | 46 | #endif |
47 | ; | 47 | ; |
48 | return r; | 48 | return r; |
49 | } | 49 | } |
50 | 50 | ||
51 | static size_t _curl_tostring(void *ptr,size_t size,size_t nmemb,void *stream) { | 51 | static size_t _curl_tostring(void *ptr,size_t size,size_t nmemb,void *stream) { |
52 | string *str = (string*)stream; | 52 | string *str = (string*)stream; |
53 | size_t bytes = size*nmemb; | 53 | size_t bytes = size*nmemb; |
54 | size_t get = min(16384-str->length(),bytes); | 54 | size_t get = min(16384-str->length(),bytes); |
55 | str->append((const char*)ptr,get); | 55 | str->append((const char*)ptr,get); |
56 | return get; | 56 | return get; |
57 | } | 57 | } |
58 | 58 | ||
59 | assoc_t consumer_t::associate(const string& server) { | 59 | assoc_t consumer_t::associate(const string& server) { |
60 | util::dh_t dh = DH_new(); | 60 | util::dh_t dh = DH_new(); |
61 | if(!dh) | 61 | if(!dh) |
62 | throw exception_openssl(OPKELE_CP_ "failed to DH_new()"); | 62 | throw exception_openssl(OPKELE_CP_ "failed to DH_new()"); |
63 | dh->p = util::dec_to_bignum(data::_default_p); | 63 | dh->p = util::dec_to_bignum(data::_default_p); |
64 | dh->g = util::dec_to_bignum(data::_default_g); | 64 | dh->g = util::dec_to_bignum(data::_default_g); |
65 | if(!DH_generate_key(dh)) | 65 | if(!DH_generate_key(dh)) |
66 | throw exception_openssl(OPKELE_CP_ "failed to DH_generate_key()"); | 66 | throw exception_openssl(OPKELE_CP_ "failed to DH_generate_key()"); |
67 | string request = | 67 | string request = |
68 | "openid.mode=associate" | 68 | "openid.mode=associate" |
69 | "&openid.assoc_type=HMAC-SHA1" | 69 | "&openid.assoc_type=HMAC-SHA1" |
70 | "&openid.session_type=DH-SHA1" | 70 | "&openid.session_type=DH-SHA1" |
71 | "&openid.dh_consumer_public="; | 71 | "&openid.dh_consumer_public="; |
72 | request += util::url_encode(util::bignum_to_base64(dh->pub_key)); | 72 | request += util::url_encode(util::bignum_to_base64(dh->pub_key)); |
73 | curl_t curl = curl_easy_init(); | 73 | curl_t curl = curl_easy_init(); |
74 | if(!curl) | 74 | if(!curl) |
75 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); | 75 | throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()"); |
76 | string response; | 76 | string response; |