| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | lib/params.cc | 16 |
2 files changed, 23 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 8397914..19e7832 100644 --- a/configure.ac +++ b/configure.ac @@ -70,16 +70,23 @@ ${curl_ssl_verify_host} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYHOST],,[defined if curl_ssl_verify_peer="true" AC_ARG_ENABLE([ssl-verify-peer], AC_HELP_STRING([--disable-ssl-verify-peer],[disable cURL cert validity verification]), [ test "${enableval}" = "no" && curl_ssl_verify_peer="false" ] ) ${curl_ssl_verify_peer} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYPEER],,[defined if cURL is not to verify cert validity]) +postels_law=true +AC_ARG_ENABLE([postels-law], + AC_HELP_STRING([--disable-postels-law],[Be strict, do not adhere to Postel's Law ("be conservative in what you do, be liberal in what you accept from others", RFC 793)]), + [ test "${enableval}" = "no" && postels_law=false ] +) +$postels_law && AC_DEFINE([POSTELS_LAW],,[defined if we want to adhere to Postel's Law]) + AC_CONFIG_FILES([ Makefile libopkele.pc Doxyfile include/Makefile lib/Makefile ]) AC_OUTPUT diff --git a/lib/params.cc b/lib/params.cc index b181811..ea86d3a 100644 --- a/lib/params.cc +++ b/lib/params.cc @@ -1,14 +1,16 @@ #include <opkele/types.h> #include <opkele/exception.h> #include <opkele/util.h> #include <openssl/sha.h> #include <openssl/hmac.h> +#include "config.h" + namespace opkele { using namespace std; bool params_t::has_param(const string& n) const { return find(n)!=end(); } const string& params_t::get_param(const string& n) const { const_iterator i = find(n); @@ -25,22 +27,36 @@ namespace opkele { 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; +#ifndef POSTELS_LAW 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; +#else /* POSTELS_LAW */ + string::size_type lb = kv.find_first_of("\r\n",co+1); + if(lb==string::npos) { + insert(value_type(kv.substr(p,co-p),kv.substr(co+1))); + break; + } + if(lb>co) + insert(value_type(kv.substr(p,co-p),kv.substr(co+1,lb-co-1))); + string::size_type nolb = kv.find_first_not_of("\r\n",lb); + if(nolb==string::npos) + break; + p = nolb; +#endif /* POSTELS_LAW */ } } 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); |