From 6a6367fa914ef9a095689c0fe0102c3bb61e7138 Mon Sep 17 00:00:00 2001
From: Miek Gieben <miek@miek.nl>
Date: Tue, 14 May 2013 22:00:11 +0100
Subject: [PATCH] Check and set Security=TypeNSEC

When signing with Sign() only a unsecured or a TypeNSEC zone can be
signed. An NSEC3 type zone must be signed with Sign3()
---
 zone.go | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/zone.go b/zone.go
index abea956a..0469b37f 100644
--- a/zone.go
+++ b/zone.go
@@ -7,6 +7,7 @@ package dns
 // A structure for handling zone data
 
 import (
+	"errors"
 	"math/rand"
 	"runtime"
 	"sort"
@@ -91,6 +92,7 @@ func newSignatureConfig() *SignatureConfig {
 var DefaultSignatureConfig = newSignatureConfig()
 
 // NewZone creates an initialized zone with Origin set to the lower cased origin.
+// The Security is set to TypeNone.
 func NewZone(origin string) *Zone {
 	if origin == "" {
 		origin = "."
@@ -370,8 +372,13 @@ func compareLabelsSlice(l1 []string, s2 string) (n int) {
 }
 
 // Sign (re)signs the zone z with the given keys.
-// NSECs and RRSIGs are added as needed.
-// The public keys themselves are not added to the zone.
+// NSECs and RRSIGs are added as needed. The zone's Security must be TypeNone
+// or TypeNSEC.
+// After the signing the Security is set to TypeNSEC. Signing an NSEC3
+// zone with this function will lead to undesirable results, i.e. a zone with NSEC and
+// NSEC3 records in it.
+// 
+// The public keys are not added to the zone.
 // If config is nil DefaultSignatureConfig is used. The signatureConfig
 // describes how the zone must be signed and if the SEP flag (for KSK)
 // should be honored. If signatures approach their expriration time, they
@@ -389,6 +396,9 @@ func (z *Zone) Sign(keys map[*DNSKEY]PrivateKey, config *SignatureConfig) error
 	z.Lock()
 	z.ModTime = time.Now().UTC()
 	defer z.Unlock()
+	if z.Security != TypeNone || z.Security != TypeNSEC {
+		return errors.New("dns: bad authenticated denial of existence type")
+	}
 	if config == nil {
 		config = DefaultSignatureConfig
 	}
@@ -429,6 +439,7 @@ Sign:
 		return err
 	}
 	wg.Wait()
+	z.Security = TypeNSEC
 	return nil
 }