summaryrefslogtreecommitdiffabout
path: root/lib/consumer.cc
authorMichael Krelin <hacker@klever.net>2007-11-20 18:39:51 (UTC)
committer Michael Krelin <hacker@klever.net>2007-11-20 18:39:51 (UTC)
commitc868af04ffd60a04c7a98a55cd92b5e12102b1e1 (patch) (unidiff)
tree0878b62d8c49f6edb175ee6c0605c27613bce2ab /lib/consumer.cc
parentbc8cecfcf7e1dc593249200556e5553d7d025c05 (diff)
downloadlibopkele-c868af04ffd60a04c7a98a55cd92b5e12102b1e1.zip
libopkele-c868af04ffd60a04c7a98a55cd92b5e12102b1e1.tar.gz
libopkele-c868af04ffd60a04c7a98a55cd92b5e12102b1e1.tar.bz2
added more precise source tree version detection
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (limited to 'lib/consumer.cc') (more/less context) (ignore whitespace changes)
-rw-r--r--lib/consumer.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc
index f72ae08..76b6ea7 100644
--- a/lib/consumer.cc
+++ b/lib/consumer.cc
@@ -52,65 +52,65 @@ namespace opkele {
52 pcre_t& operator=(pcre *p) { if(_p) (*pcre_free)(_p); _p=p; return *this; } 52 pcre_t& operator=(pcre *p) { if(_p) (*pcre_free)(_p); _p=p; return *this; }
53 53
54 operator const pcre*(void) const { return _p; } 54 operator const pcre*(void) const { return _p; }
55 operator pcre*(void) { return _p; } 55 operator pcre*(void) { return _p; }
56 56
57 int exec(const string& s,pcre_matches_t& m) { 57 int exec(const string& s,pcre_matches_t& m) {
58 if(!_p) 58 if(!_p)
59 throw internal_error(OPKELE_CP_ "Trying to execute absent regexp"); 59 throw internal_error(OPKELE_CP_ "Trying to execute absent regexp");
60 return pcre_exec(_p,NULL,s.c_str(),s.length(),0,0,m._ov,m._s); 60 return pcre_exec(_p,NULL,s.c_str(),s.length(),0,0,m._ov,m._s);
61 } 61 }
62 }; 62 };
63 63
64 class curl_t { 64 class curl_t {
65 public: 65 public:
66 CURL *_c; 66 CURL *_c;
67 67
68 curl_t() : _c(0) { } 68 curl_t() : _c(0) { }
69 curl_t(CURL *c) : _c(c) { } 69 curl_t(CURL *c) : _c(c) { }
70 ~curl_t() throw() { if(_c) curl_easy_cleanup(_c); } 70 ~curl_t() throw() { if(_c) curl_easy_cleanup(_c); }
71 71
72 curl_t& operator=(CURL *c) { if(_c) curl_easy_cleanup(_c); _c=c; return *this; } 72 curl_t& operator=(CURL *c) { if(_c) curl_easy_cleanup(_c); _c=c; return *this; }
73 73
74 operator const CURL*(void) const { return _c; } 74 operator const CURL*(void) const { return _c; }
75 operator CURL*(void) { return _c; } 75 operator CURL*(void) { return _c; }
76 }; 76 };
77 77
78 static CURLcode curl_misc_sets(CURL* c) { 78 static CURLcode curl_misc_sets(CURL* c) {
79 CURLcode r; 79 CURLcode r;
80 (r=curl_easy_setopt(c,CURLOPT_FOLLOWLOCATION,1)) 80 (r=curl_easy_setopt(c,CURLOPT_FOLLOWLOCATION,1))
81 || (r=curl_easy_setopt(c,CURLOPT_MAXREDIRS,5)) 81 || (r=curl_easy_setopt(c,CURLOPT_MAXREDIRS,5))
82 || (r=curl_easy_setopt(c,CURLOPT_DNS_CACHE_TIMEOUT,120)) 82 || (r=curl_easy_setopt(c,CURLOPT_DNS_CACHE_TIMEOUT,120))
83 || (r=curl_easy_setopt(c,CURLOPT_DNS_USE_GLOBAL_CACHE,1)) 83 || (r=curl_easy_setopt(c,CURLOPT_DNS_USE_GLOBAL_CACHE,1))
84 || (r=curl_easy_setopt(c,CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_VERSION)) 84 || (r=curl_easy_setopt(c,CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_SRC_VERSION))
85 || (r=curl_easy_setopt(c,CURLOPT_TIMEOUT,20)) 85 || (r=curl_easy_setopt(c,CURLOPT_TIMEOUT,20))
86 #ifdefDISABLE_CURL_SSL_VERIFYHOST 86 #ifdefDISABLE_CURL_SSL_VERIFYHOST
87 || (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYHOST,0)) 87 || (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYHOST,0))
88#endif 88#endif
89 #ifdefDISABLE_CURL_SSL_VERIFYPEER 89 #ifdefDISABLE_CURL_SSL_VERIFYPEER
90 || (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYPEER,0)) 90 || (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYPEER,0))
91#endif 91#endif
92 ; 92 ;
93 return r; 93 return r;
94 } 94 }
95 95
96 static size_t _curl_tostring(void *ptr,size_t size,size_t nmemb,void *stream) { 96 static size_t _curl_tostring(void *ptr,size_t size,size_t nmemb,void *stream) {
97 string *str = (string*)stream; 97 string *str = (string*)stream;
98 size_t bytes = size*nmemb; 98 size_t bytes = size*nmemb;
99 size_t get = min(16384-str->length(),bytes); 99 size_t get = min(16384-str->length(),bytes);
100 str->append((const char*)ptr,get); 100 str->append((const char*)ptr,get);
101 return get; 101 return get;
102 } 102 }
103 103
104 assoc_t consumer_t::associate(const string& server) { 104 assoc_t consumer_t::associate(const string& server) {
105 util::dh_t dh = DH_new(); 105 util::dh_t dh = DH_new();
106 if(!dh) 106 if(!dh)
107 throw exception_openssl(OPKELE_CP_ "failed to DH_new()"); 107 throw exception_openssl(OPKELE_CP_ "failed to DH_new()");
108 dh->p = util::dec_to_bignum(data::_default_p); 108 dh->p = util::dec_to_bignum(data::_default_p);
109 dh->g = util::dec_to_bignum(data::_default_g); 109 dh->g = util::dec_to_bignum(data::_default_g);
110 if(!DH_generate_key(dh)) 110 if(!DH_generate_key(dh))
111 throw exception_openssl(OPKELE_CP_ "failed to DH_generate_key()"); 111 throw exception_openssl(OPKELE_CP_ "failed to DH_generate_key()");
112 string request = 112 string request =
113 "openid.mode=associate" 113 "openid.mode=associate"
114 "&openid.assoc_type=HMAC-SHA1" 114 "&openid.assoc_type=HMAC-SHA1"
115 "&openid.session_type=DH-SHA1" 115 "&openid.session_type=DH-SHA1"
116 "&openid.dh_consumer_public="; 116 "&openid.dh_consumer_public=";