author | Michael Krelin <hacker@klever.net> | 2007-12-04 19:02:15 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-12-04 19:02:15 (UTC) |
commit | 7a6a6fbcf7e20f0d7da5f625a73c865b361f16aa (patch) (unidiff) | |
tree | 42a2983bd4fdbba0b49d9a5329e5f819ad73d5ec /lib | |
parent | 206de587733c5dbde280fb6e9f1eab2f02de7f54 (diff) | |
download | libopkele-7a6a6fbcf7e20f0d7da5f625a73c865b361f16aa.zip libopkele-7a6a6fbcf7e20f0d7da5f625a73c865b361f16aa.tar.gz libopkele-7a6a6fbcf7e20f0d7da5f625a73c865b361f16aa.tar.bz2 |
Minor improvements
- almost irrelevant documentation updates
- introduced id_res_expired_on_delivery exception to be thrown if the
association has expired right before it could've been used for signature
verification.
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | lib/consumer.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc index 66db7dd..9f7530f 100644 --- a/lib/consumer.cc +++ b/lib/consumer.cc | |||
@@ -181,14 +181,14 @@ namespace opkele { | |||
181 | throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided",pin.get_param("openid.user_setup_url")); | 181 | throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided",pin.get_param("openid.user_setup_url")); |
182 | string server,delegate; | 182 | string server,delegate; |
183 | retrieve_links(identity.empty()?pin.get_param("openid.identity"):canonicalize(identity),server,delegate); | 183 | retrieve_links(identity.empty()?pin.get_param("openid.identity"):canonicalize(identity),server,delegate); |
184 | params_t ps; | 184 | params_t ps; |
185 | try { | 185 | try { |
186 | assoc_t assoc = retrieve_assoc(server,pin.get_param("openid.assoc_handle")); | 186 | assoc_t assoc = retrieve_assoc(server,pin.get_param("openid.assoc_handle")); |
187 | if(assoc->is_expired()) /* TODO: or should I throw some other exception to force programmer fix his implementation? */ | 187 | if(assoc->is_expired()) |
188 | throw failed_lookup(OPKELE_CP_ "retrieve_assoc() has returned expired handle"); | 188 | throw id_res_expired_on_delivery(OPKELE_CP_ "retrieve_assoc() has returned expired handle"); |
189 | const string& sigenc = pin.get_param("openid.sig"); | 189 | const string& sigenc = pin.get_param("openid.sig"); |
190 | vector<unsigned char> sig; | 190 | vector<unsigned char> sig; |
191 | util::decode_base64(sigenc,sig); | 191 | util::decode_base64(sigenc,sig); |
192 | const string& slist = pin.get_param("openid.signed"); | 192 | const string& slist = pin.get_param("openid.signed"); |
193 | string kv; | 193 | string kv; |
194 | string::size_type p = 0; | 194 | string::size_type p = 0; |
@@ -211,13 +211,13 @@ namespace opkele { | |||
211 | EVP_sha1(), | 211 | EVP_sha1(), |
212 | &(secret.front()),secret.size(), | 212 | &(secret.front()),secret.size(), |
213 | (const unsigned char *)kv.data(),kv.length(), | 213 | (const unsigned char *)kv.data(),kv.length(), |
214 | 0,&md_len); | 214 | 0,&md_len); |
215 | if(sig.size()!=md_len || memcmp(&(sig.front()),md,md_len)) | 215 | if(sig.size()!=md_len || memcmp(&(sig.front()),md,md_len)) |
216 | throw id_res_mismatch(OPKELE_CP_ "signature mismatch"); | 216 | throw id_res_mismatch(OPKELE_CP_ "signature mismatch"); |
217 | }catch(failed_lookup& e) { /* XXX: more specific? */ | 217 | }catch(failed_lookup& e) { |
218 | const string& slist = pin.get_param("openid.signed"); | 218 | const string& slist = pin.get_param("openid.signed"); |
219 | string::size_type pp = 0; | 219 | string::size_type pp = 0; |
220 | params_t p; | 220 | params_t p; |
221 | while(true) { | 221 | while(true) { |
222 | string::size_type co = slist.find(',',pp); | 222 | string::size_type co = slist.find(',',pp); |
223 | string f = "openid."; | 223 | string f = "openid."; |