mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-02 14:16:16 -04:00
Merge branch 'master' into extra_locators
This commit is contained in:
commit
518df99243
27 changed files with 297 additions and 99 deletions
|
@ -360,8 +360,9 @@ bool RsCertificate::initFromString(const std::string& instr,uint32_t& err_code)
|
|||
}
|
||||
break ;
|
||||
default:
|
||||
err_code = CERTIFICATE_PARSING_ERROR_UNKNOWN_SECTION_PTAG ;
|
||||
return false ;
|
||||
std::cerr << "(WW) unknwown PTAG 0x" << std::hex << ptag << std::dec << " in certificate! Ignoring it." << std::endl;
|
||||
buf = &buf[s] ;
|
||||
break ;
|
||||
}
|
||||
|
||||
total_s += s ;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue