mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-25 01:01:40 -04:00
patch from Henry morgan to fix soem typos (e.g misspelled connexion into connection)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6460 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
748f7db7a4
commit
4868a90d81
10 changed files with 22 additions and 22 deletions
|
@ -1296,7 +1296,7 @@ bool AuthSSLimpl::decrypt(void *&out, int &outlen, const void *in, int inlen)
|
|||
void AuthSSLimpl::setCurrentConnectionAttemptInfo(const std::string& gpg_id,const std::string& ssl_id,const std::string& ssl_cn)
|
||||
{
|
||||
#ifdef AUTHSSL_DEBUG
|
||||
std::cerr << "AuthSSL: registering connexion attempt from:" << std::endl;
|
||||
std::cerr << "AuthSSL: registering connection attempt from:" << std::endl;
|
||||
std::cerr << " GPG id: " << gpg_id << std::endl;
|
||||
std::cerr << " SSL id: " << ssl_id << std::endl;
|
||||
std::cerr << " SSL cn: " << ssl_cn << std::endl;
|
||||
|
|
|
@ -1613,7 +1613,7 @@ int pqissl::readdata(void *data, int len)
|
|||
{
|
||||
// SSL_WANT_READ is not a crittical error. It's just a sign that
|
||||
// the internal SSL buffer is not ready to accept more data. So -1
|
||||
// is returned, and the connexion will be retried as is on next
|
||||
// is returned, and the connection will be retried as is on next
|
||||
// call of readdata().
|
||||
|
||||
#ifdef PQISSL_DEBUG
|
||||
|
|
|
@ -381,13 +381,13 @@ int pqissllistenbase::continueSSL(IncomingSSLInfo& incoming_connexion_info, bool
|
|||
// attempt the accept again.
|
||||
int fd = SSL_get_fd(incoming_connexion_info.ssl);
|
||||
|
||||
// clear the connexion info that will be filled in by the callback.
|
||||
// clear the connection info that will be filled in by the callback.
|
||||
//
|
||||
AuthSSL::getAuthSSL()->setCurrentConnectionAttemptInfo(std::string(),std::string(),std::string()) ;
|
||||
|
||||
int err = SSL_accept(incoming_connexion_info.ssl);
|
||||
|
||||
// No grab the connexion info that was filled in by the callback.
|
||||
// No grab the connection info that was filled in by the callback.
|
||||
//
|
||||
AuthSSL::getAuthSSL()->getCurrentConnectionAttemptInfo(incoming_connexion_info.gpgid,incoming_connexion_info.sslid,incoming_connexion_info.sslcn) ;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue