summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--lib/basic_op.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/basic_op.cc b/lib/basic_op.cc
index 9e2ea5a..7a2dbd2 100644
--- a/lib/basic_op.cc
+++ b/lib/basic_op.cc
@@ -141,16 +141,13 @@ namespace opkele {
141 mode = mode_checkid_immediate; 141 mode = mode_checkid_immediate;
142 else 142 else
143 throw bad_input(OPKELE_CP_ "Invalid checkid_* mode"); 143 throw bad_input(OPKELE_CP_ "Invalid checkid_* mode");
144 try { 144 try {
145 assoc = retrieve_assoc(invalidate_handle=inm.get_field("assoc_handle")); 145 assoc = retrieve_assoc(invalidate_handle=inm.get_field("assoc_handle"));
146 invalidate_handle.clear(); 146 invalidate_handle.clear();
147 }catch(failed_lookup&) { 147 }catch(failed_lookup&) { }
148 // no handle specified or no valid assoc found, go dumb
149 assoc = alloc_assoc("HMAC-SHA256",SHA256_DIGEST_LENGTH,true);
150 }
151 try { 148 try {
152 openid2 = (inm.get_field("ns")==OIURI_OPENID20); 149 openid2 = (inm.get_field("ns")==OIURI_OPENID20);
153 }catch(failed_lookup&) { openid2 = false; } 150 }catch(failed_lookup&) { openid2 = false; }
154 try { 151 try {
155 return_to = inm.get_field("return_to"); 152 return_to = inm.get_field("return_to");
156 }catch(failed_lookup&) { } 153 }catch(failed_lookup&) { }
@@ -195,15 +192,17 @@ namespace opkele {
195 verify_return_to(); 192 verify_return_to();
196 if(ext) ext->op_checkid_hook(inm); 193 if(ext) ext->op_checkid_hook(inm);
197 } 194 }
198 195
199 basic_openid_message& basic_op::id_res(basic_openid_message& om, 196 basic_openid_message& basic_op::id_res(basic_openid_message& om,
200 extension_t *ext) { 197 extension_t *ext) {
201 assert(assoc);
202 assert(!return_to.empty()); 198 assert(!return_to.empty());
203 assert(!is_id_select()); 199 assert(!is_id_select());
200 if(!assoc) {
201 assoc = alloc_assoc("HMAC-SHA256",SHA256_DIGEST_LENGTH,true);
202 }
204 time_t now = time(0); 203 time_t now = time(0);
205 struct tm gmt; gmtime_r(&now,&gmt); 204 struct tm gmt; gmtime_r(&now,&gmt);
206 char w3timestr[24]; 205 char w3timestr[24];
207 if(!strftime(w3timestr,sizeof(w3timestr),"%Y-%m-%dT%H:%M:%SZ",&gmt)) 206 if(!strftime(w3timestr,sizeof(w3timestr),"%Y-%m-%dT%H:%M:%SZ",&gmt))
208 throw failed_conversion(OPKELE_CP_ 207 throw failed_conversion(OPKELE_CP_
209 "Failed to build time string for nonce" ); 208 "Failed to build time string for nonce" );