=== added file '.bzrignore' --- .bzrignore 1970-01-01 00:00:00 +0000 +++ .bzrignore 2008-08-27 01:18:25 +0000 @@ -0,0 +1,8 @@ +*.5 +*.8 +*.8mandos +plugin-runner +plugins.d/password-prompt +plugins.d/password-request +confdir +keydir === modified file 'TODO' --- TODO 2008-08-25 07:52:35 +0000 +++ TODO 2008-08-27 01:18:25 +0000 @@ -106,10 +106,16 @@ ** Disable client ** Enable client +* Man pages tags + Go through all man pages to conform to the style of tags chosen in + [[http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/examples/foo.1.example_manpage.xml?op=file&rev=0&sc=0][foo.1.example_manpage.xml]]. + * Installer ** Client-side *** Update initrd.img after installation This seems to use some kind of "trigger" system + [[file:/usr/share/doc/dpkg/triggers.txt.gz]] + dpkg-trigger(1), deb-triggers(5) *** Keydir move: /etc/mandos -> /etc/keys/mandos Must create in preinst if not pre-depending on cryptsetup *** mandos-keygen === modified file 'clients.conf' --- clients.conf 2008-08-22 00:16:20 +0000 +++ clients.conf 2008-08-27 01:18:25 +0000 @@ -43,7 +43,6 @@ ; 5MHdW9AYsNJZAQSOpirE4Xi31CSlWAi9KV+cUCmWF5zOFy1x23P6PjdaRm ; 4T2zw4dxS5NswXWU0sVEXxjs6PYxuIiCTL7vdpx8QjBkrPWDrAbcMyBr2O ; QlnHIvPzEArRQLo= -; =iHhv ; ;# Host name; used only by the checker, not used by the server itself. ;host = foo.example.org === modified file 'mandos' --- mandos 2008-08-24 10:52:46 +0000 +++ mandos 2008-08-27 01:18:25 +0000 @@ -24,7 +24,8 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see +# . # # Contact the authors at . # @@ -123,11 +124,13 @@ def rename(self): """Derived from the Avahi example code""" if self.rename_count >= self.max_renames: - logger.critical(u"No suitable service name found after %i" - u" retries, exiting.", rename_count) + logger.critical(u"No suitable Zeroconf service name found" + u" after %i retries, exiting.", + rename_count) raise AvahiServiceError("Too many renames") self.name = server.GetAlternativeServiceName(self.name) - logger.info(u"Changing name to %r ...", str(self.name)) + logger.info(u"Changing Zeroconf service name to %r ...", + str(self.name)) syslogger.setFormatter(logging.Formatter\ ('Mandos (%s): %%(levelname)s:' ' %%(message)s' % self.name)) @@ -148,7 +151,7 @@ avahi.DBUS_INTERFACE_ENTRY_GROUP) group.connect_to_signal('StateChanged', entry_group_state_changed) - logger.debug(u"Adding service '%s' of type '%s' ...", + logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...", service.name, service.type) group.AddService( self.interface, # interface @@ -413,7 +416,7 @@ # Verify the self signature in the key crtverify = ctypes.c_uint(); gnutls.library.functions.gnutls_openpgp_crt_verify_self\ - (crt, ctypes.c_uint(0), ctypes.byref(crtverify)) + (crt, 0, ctypes.byref(crtverify)) if crtverify.value != 0: gnutls.library.functions.gnutls_openpgp_crt_deinit(crt) raise gnutls.errors.CertificateSecurityError("Verify failed") @@ -603,7 +606,7 @@ def server_state_changed(state): """Derived from the Avahi example code""" if state == avahi.SERVER_COLLISION: - logger.error(u"Server name collision") + logger.error(u"Zeroconf server name collision") service.remove() elif state == avahi.SERVER_RUNNING: service.add() @@ -611,15 +614,15 @@ def entry_group_state_changed(state, error): """Derived from the Avahi example code""" - logger.debug(u"state change: %i", state) + logger.debug(u"Avahi state change: %i", state) if state == avahi.ENTRY_GROUP_ESTABLISHED: - logger.debug(u"Service established.") + logger.debug(u"Zeroconf service established.") elif state == avahi.ENTRY_GROUP_COLLISION: - logger.warning(u"Service name collision.") + logger.warning(u"Zeroconf service name collision.") service.rename() elif state == avahi.ENTRY_GROUP_FAILURE: - logger.critical(u"Error in group state changed %s", + logger.critical(u"Avahi: Error in group state changed %s", unicode(error)) raise AvahiGroupError("State changed: %s", str(error)) @@ -759,7 +762,8 @@ service = AvahiService(name = server_settings["servicename"], type = "_mandos._tcp", ); if server_settings["interface"]: - service.interface = if_nametoindex(server_settings["interface"]) + service.interface = if_nametoindex\ + (server_settings["interface"]) global main_loop global bus @@ -768,9 +772,9 @@ DBusGMainLoop(set_as_default=True ) main_loop = gobject.MainLoop() bus = dbus.SystemBus() - server = dbus.Interface( - bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ), - avahi.DBUS_INTERFACE_SERVER ) + server = dbus.Interface(bus.get_object(avahi.DBUS_NAME, + avahi.DBUS_PATH_SERVER), + avahi.DBUS_INTERFACE_SERVER) # End of Avahi example code clients = Set() === modified file 'mandos-options.xml' --- mandos-options.xml 2008-08-25 06:44:13 +0000 +++ mandos-options.xml 2008-08-25 10:41:16 +0000 @@ -25,8 +25,9 @@ interface should be set, since a link-local address is only valid on a single interface. By default, the server will listen to all available addresses. If set, this must be an IPv6 address; an - IPv4 address can only be specified using the ::FFFF:192.0.2.3 format. + IPv4 address can only be specified using IPv4-mapped IPv6 address + syntax: ::FFFF:192.0.2.3. === modified file 'mandos.conf.xml' --- mandos.conf.xml 2008-08-25 06:44:13 +0000 +++ mandos.conf.xml 2008-08-25 10:41:16 +0000 @@ -216,7 +216,55 @@ mandos 8, mandos-clients.conf - 5 + 5, + gnutls_priority_init + 3 + + + + + RFC 4291: IP Version 6 Addressing + Architecture + + + + + Section 2.2: Text Representation of + Addresses + + + + Section 2.5.5.2: IPv4-Mapped IPv6 + Address + + + + Section 2.5.6, Link-Local IPv6 Unicast + Addresses + + + The clients use IPv6 link-local addresses, which are + immediately usable since a link-local addresses is + automatically assigned to a network interfaces when it + is brought up. + + + + + + + + + Zeroconf + + + + Zeroconf is the network protocol standard used by clients + for finding the Mandos server on the local network. + + + + === modified file 'mandos.xml' --- mandos.xml 2008-08-25 06:44:13 +0000 +++ mandos.xml 2008-08-25 10:41:16 +0000 @@ -572,8 +572,8 @@ - GnuTLS + GnuTLS @@ -585,23 +585,40 @@ - RFC 4291: IP Version 6 Addressing - Architecture, section 2.5.6, Link-Local IPv6 - Unicast Addresses + RFC 4291: IP Version 6 Addressing + Architecture - - The clients use IPv6 link-local addresses, which are - immediately usable since a link-local addresses is - automatically assigned to a network interfaces when it is - brought up. - + + + Section 2.2: Text Representation of + Addresses + + + + Section 2.5.5.2: IPv4-Mapped IPv6 + Address + + + + Section 2.5.6, Link-Local IPv6 Unicast + Addresses + + + The clients use IPv6 link-local addresses, which are + immediately usable since a link-local addresses is + automatically assigned to a network interfaces when it + is brought up. + + + + - RFC 4346: The Transport Layer Security - (TLS) Protocol Version 1.1 + RFC 4346: The Transport Layer Security (TLS) + Protocol Version 1.1 @@ -611,8 +628,7 @@ - RFC 4880: OpenPGP Message - Format + RFC 4880: OpenPGP Message Format @@ -622,8 +638,8 @@ - RFC 5081: Using OpenPGP Keys for - Transport Layer Security + RFC 5081: Using OpenPGP Keys for Transport Layer + Security