/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 mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-04-02 18:59:29 UTC
  • mto: (237.7.304 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150402185929-1q1rf1zelbpzzn74
Add "!RSA" also to examples/documentation.

* mandos.conf (priority): Add "!RSA" to default commented-out value.
* mandos.conf.xml (EXAMPLE): Add "!RSA" to example priority setting.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
487
487
            client["enabled"] = config.getboolean(client_name,
488
488
                                                  "enabled")
489
489
            
 
490
            # Uppercase and remove spaces from fingerprint for later
 
491
            # comparison purposes with return value from the
 
492
            # fingerprint() function
490
493
            client["fingerprint"] = (section["fingerprint"].upper()
491
494
                                     .replace(" ", ""))
492
495
            if "secret" in section:
534
537
            self.expires = None
535
538
        
536
539
        logger.debug("Creating client %r", self.name)
537
 
        # Uppercase and remove spaces from fingerprint for later
538
 
        # comparison purposes with return value from the fingerprint()
539
 
        # function
540
540
        logger.debug("  Fingerprint: %s", self.fingerprint)
541
541
        self.created = settings.get("created",
542
542
                                    datetime.datetime.utcnow())
2356
2356
                        "port": "",
2357
2357
                        "debug": "False",
2358
2358
                        "priority":
2359
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2359
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2360
                        ":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2360
2361
                        "servicename": "Mandos",
2361
2362
                        "use_dbus": "True",
2362
2363
                        "use_ipv6": "True",