Merge branch '107192666-ds-key-data-dnssec' into staging

This commit is contained in:
Matt Farnsworth 2015-11-23 12:56:26 +02:00
commit 15e2a416da
2 changed files with 4 additions and 5 deletions

View file

@ -12,10 +12,9 @@ module Depp
['6 - DSA-NSEC3-SHA1', 6],
['7 - RSASHA1-NSEC3-SHA1', 7],
['8 - RSA/SHA-256', 8],
['252 - Reserved for Indirect Keys', 252],
['253 - Private algorithm', 253],
['254 - Private algorithm OID', 254],
['255 - Reserved', 255]
['10 - RSA/SHA-512', 10],
['13 - ECDSA Curve P-256 with SHA-256', 13],
['14 - ECDSA Curve P-384 with SHA-384', 14]
]
PROTOCOLS = [3]

View file

@ -17,7 +17,7 @@ class Dnskey < ActiveRecord::Base
end
}
ALGORITHMS = %w(3 5 6 7 8 252 253 254 255)
ALGORITHMS = %w(3 5 6 7 8 10 13 14)
PROTOCOLS = %w(3)
FLAGS = %w(0 256 257) # 256 = ZSK, 257 = KSK