From bcf38e55ad16e533f612c1dafd3b4e5c661d3f5b Mon Sep 17 00:00:00 2001 From: Matt Farnsworth Date: Tue, 24 Nov 2015 12:50:38 +0200 Subject: [PATCH] Story #107192666 - ds-digest requires ZoneFlag, but SecureEntryPoint is optional --- app/models/dnskey.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/dnskey.rb b/app/models/dnskey.rb index fb72f1205..05adbe29a 100644 --- a/app/models/dnskey.rb +++ b/app/models/dnskey.rb @@ -67,7 +67,7 @@ class Dnskey < ActiveRecord::Base end def generate_digest - return if flags != 257 # generate ds only with KSK + return unless flags == 257 || flags == 256 # require ZoneFlag, but optional SecureEntryPoint self.ds_alg = alg self.ds_digest_type = Setting.ds_algorithm if ds_digest_type.blank? || !DS_DIGEST_TYPE.include?(ds_digest_type) @@ -90,7 +90,7 @@ class Dnskey < ActiveRecord::Base end def generate_ds_key_tag - return if flags != 257 # generate ds key tag only with KSK + return unless flags == 257 || flags == 256 # require ZoneFlag, but optional SecureEntryPoint pk = public_key.gsub(' ', '') wire_format = [flags, protocol, alg].pack('S!>CC') wire_format += Base64.decode64(pk)