Be a bit more liberal in what we accept as key-value pairs

2 files changed, 2 insertions, 0 deletions

diff --git a/NEWS.xml b/NEWS.xml
index d8b93f2..210cf13 100644
--- a/NEWS.xml
+++ b/NEWS.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="us-ascii"?>
 <news>
  <version version="0.1" date="January 12th, 2007">
   <ni>OpenID simple registration extension implementation</ni>
   <ni>OpenID extensions framework</ni>
   <ni>Canonicalization bugfix</ni>
+  <ni>Slightly improved interoperability with buggy implementations</ni>
  </version>
  <version version="0.0" date="July 25th, 2005">
   <ni>Initial release</ni>
  </version>
 </news>
diff --git a/lib/params.cc b/lib/params.cc
index 03867d5..b181811 100644
--- a/lib/params.cc
+++ b/lib/params.cc
@@ -20,32 +20,33 @@ namespace opkele {
 	iterator i = find(n);
 	if(i==end())
 	    throw failed_lookup(OPKELE_CP_ n+": no such parameter");
 	return i->second;
     }
 
     void params_t::parse_keyvalues(const string& kv) {
 	clear();
 	string::size_type p = 0;
 	while(true) {
 	    string::size_type co = kv.find(':',p);
 	    if(co==string::npos)
 		break;
 	    string::size_type nl = kv.find('\n',co+1);
 	    if(nl==string::npos)
 		throw bad_input(OPKELE_CP_ "malformed input");
+	    if(nl>co)
 	    insert(value_type(kv.substr(p,co-p),kv.substr(co+1,nl-co-1)));
 	    p = nl+1;
 	}
     }
 
     void params_t::sign(secret_t secret,string& sig,const string& slist,const char *prefix) const {
 	string kv;
 	string::size_type p = 0;
 	while(true) {
 	    string::size_type co = slist.find(',',p);
 	    string f = (co==string::npos)?slist.substr(p):slist.substr(p,co-p);
 	    kv += f;
 	    kv += ':';
 	    if(prefix) f.insert(0,prefix);
 	    kv += get_param(f);
 	    kv += '\n';