summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2008-02-09 22:59:55 (UTC)
committer Michael Krelin <hacker@klever.net>2008-02-09 22:59:55 (UTC)
commitb5a9adac9dfe84ccf509197d24b9e04ecd3ca1d3 (patch) (unidiff)
treee73d26cc9b175c7b989438674b9fba3d1eacd966
parent16667a21c3052c89218d3e56098f0fc29dca2f1a (diff)
downloadlibopkele-b5a9adac9dfe84ccf509197d24b9e04ecd3ca1d3.zip
libopkele-b5a9adac9dfe84ccf509197d24b9e04ecd3ca1d3.tar.gz
libopkele-b5a9adac9dfe84ccf509197d24b9e04ecd3ca1d3.tar.bz2
OP fixes
* allocate stateful handles when processing associate request * use the expiration from allocated handle, not empty shared_ptr Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--lib/basic_op.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/basic_op.cc b/lib/basic_op.cc
index 2d82147..c247493 100644
--- a/lib/basic_op.cc
+++ b/lib/basic_op.cc
@@ -88,34 +88,34 @@ namespace opkele {
88 if(cklen && (*ckptr)&0x80) { 88 if(cklen && (*ckptr)&0x80) {
89 (*(--ckptr)) = 0; ++cklen; } 89 (*(--ckptr)) = 0; ++cklen; }
90 if(sts=="DH-SHA1") { 90 if(sts=="DH-SHA1") {
91 SHA1(ckptr,cklen,key_digest); d_len = SHA_DIGEST_LENGTH; 91 SHA1(ckptr,cklen,key_digest); d_len = SHA_DIGEST_LENGTH;
92 }else if(sts=="DH-SHA256") { 92 }else if(sts=="DH-SHA256") {
93 SHA256(ckptr,cklen,key_digest); d_len = SHA256_DIGEST_LENGTH; 93 SHA256(ckptr,cklen,key_digest); d_len = SHA256_DIGEST_LENGTH;
94 }else 94 }else
95 throw internal_error(OPKELE_CP_ "I thought I knew the session type"); 95 throw internal_error(OPKELE_CP_ "I thought I knew the session type");
96 }else 96 }else
97 throw unsupported(OPKELE_CP_ "Unsupported session_type"); 97 throw unsupported(OPKELE_CP_ "Unsupported session_type");
98 assoc_t a; 98 assoc_t a;
99 if(ats=="HMAC-SHA1") 99 if(ats=="HMAC-SHA1")
100 a = alloc_assoc(ats,SHA_DIGEST_LENGTH,true); 100 a = alloc_assoc(ats,SHA_DIGEST_LENGTH,false);
101 else if(ats=="HMAC-SHA256") 101 else if(ats=="HMAC-SHA256")
102 a = alloc_assoc(ats,SHA256_DIGEST_LENGTH,true); 102 a = alloc_assoc(ats,SHA256_DIGEST_LENGTH,false);
103 else 103 else
104 throw unsupported(OPKELE_CP_ "Unsupported assoc_type"); 104 throw unsupported(OPKELE_CP_ "Unsupported assoc_type");
105 oum.reset_fields(); 105 oum.reset_fields();
106 oum.set_field("ns",OIURI_OPENID20); 106 oum.set_field("ns",OIURI_OPENID20);
107 oum.set_field("assoc_type",a->assoc_type()); 107 oum.set_field("assoc_type",a->assoc_type());
108 oum.set_field("assoc_handle",a->handle()); 108 oum.set_field("assoc_handle",a->handle());
109 oum.set_field("expires_in",util::long_to_string(assoc->expires_in())); 109 oum.set_field("expires_in",util::long_to_string(a->expires_in()));
110 secret_t secret = a->secret(); 110 secret_t secret = a->secret();
111 if(sts=="DH-SHA1" || sts=="DH-SHA256") { 111 if(sts=="DH-SHA1" || sts=="DH-SHA256") {
112 if(d_len != secret.size()) 112 if(d_len != secret.size())
113 throw bad_input(OPKELE_CP_ "Association secret and session MAC are not of the same size"); 113 throw bad_input(OPKELE_CP_ "Association secret and session MAC are not of the same size");
114 oum.set_field("session_type",sts); 114 oum.set_field("session_type",sts);
115 oum.set_field("dh_server_public",util::bignum_to_base64(dh->pub_key)); 115 oum.set_field("dh_server_public",util::bignum_to_base64(dh->pub_key));
116 string b64; secret.enxor_to_base64(key_digest,b64); 116 string b64; secret.enxor_to_base64(key_digest,b64);
117 oum.set_field("enc_mac_key",b64); 117 oum.set_field("enc_mac_key",b64);
118 }else /* TODO: support cleartext over encrypted connection */ 118 }else /* TODO: support cleartext over encrypted connection */
119 throw unsupported(OPKELE_CP_ "Unsupported session type"); 119 throw unsupported(OPKELE_CP_ "Unsupported session type");
120 return oum; 120 return oum;
121 } catch(unsupported& u) { 121 } catch(unsupported& u) {