/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to server.py

  • Committer: Teddy Hogeborn
  • Date: 2008-08-03 21:45:14 UTC
  • mfrom: (24.1.13 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080803214514-plvvkrpoitwsrxeg
Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server.py
433
433
    def handle(self):
434
434
        logger.debug(u"TCP connection from: %s",
435
435
                     unicode(self.client_address))
436
 
 
 
436
        session = gnutls.connection.ClientSession\
 
437
                  (self.request, gnutls.connection.X509Credentials())
 
438
        
437
439
        line = self.request.makefile().readline()
438
440
        logger.debug(u"Protocol version: %r", line)
439
441
        try:
443
445
            logger.error(u"Unknown protocol version: %s", error)
444
446
            return
445
447
        
446
 
        session = gnutls.connection.ClientSession\
447
 
                  (self.request, gnutls.connection.X509Credentials())
448
448
        # Note: gnutls.connection.X509Credentials is really a generic
449
449
        # GnuTLS certificate credentials object so long as no X.509
450
450
        # keys are added to it.  Therefore, we can use it here despite