From 210a05bcee4982e57f0178f189b3df299a887e25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Fri, 21 Apr 2006 21:00:14 +0000
Subject: [PATCH] add sha-1 and sha-2

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17142 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/asn1/Makefile.am  | 12 +++++++++++-
 lib/asn1/rfc2459.asn1 | 27 +++++++++++++++++++++------
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am
index 78a289140..68a16c75a 100644
--- a/lib/asn1/Makefile.am
+++ b/lib/asn1/Makefile.am
@@ -193,7 +193,13 @@ gen_files_rfc2459 =					\
 	asn1_id_dhpublicnumber.x			\
 	asn1_id_dsa.x					\
 	asn1_id_dsa_with_sha1.x				\
-	asn1_id_nit_aes_algs.x				\
+	asn1_id_nistAlgorithm.x				\
+	asn1_id_nist_aes_algs.x				\
+	asn1_id_nist_sha_algs.x				\
+	asn1_id_sha224.x				\
+	asn1_id_sha256.x				\
+	asn1_id_sha384.x				\
+	asn1_id_sha512.x				\
 	asn1_id_pkcs1_md2WithRSAEncryption.x		\
 	asn1_id_pkcs1_md5WithRSAEncryption.x		\
 	asn1_id_pkcs1_rsaEncryption.x			\
@@ -210,6 +216,10 @@ gen_files_rfc2459 =					\
 	asn1_id_pkcs_1.x				\
 	asn1_id_pkcs_2.x				\
 	asn1_id_pkcs_3.x				\
+	asn1_id_rsa_digestAlgorithm.x			\
+	asn1_id_rsa_digest_md2.x			\
+	asn1_id_rsa_digest_md4.x			\
+	asn1_id_rsa_digest_md5.x			\
 	asn1_id_rsadsi_des_ede3_cbc.x			\
 	asn1_id_rsadsi_encalg.x				\
 	asn1_id_rsadsi_rc2_cbc.x			\
diff --git a/lib/asn1/rfc2459.asn1 b/lib/asn1/rfc2459.asn1
index 02ae20a44..87c122a41 100644
--- a/lib/asn1/rfc2459.asn1
+++ b/lib/asn1/rfc2459.asn1
@@ -27,6 +27,13 @@ id-pkcs2-md2 OBJECT IDENTIFIER ::=		{ id-pkcs-2 2 }
 id-pkcs2-md4 OBJECT IDENTIFIER ::=		{ id-pkcs-2 4 }
 id-pkcs2-md5 OBJECT IDENTIFIER ::=		{ id-pkcs-2 5 }
 
+id-rsa-digestAlgorithm OBJECT IDENTIFIER ::= 
+{ iso(1) member-body(2) us(840) rsadsi(113549) 2 }
+
+id-rsa-digest-md2 OBJECT IDENTIFIER ::= { id-rsa-digestAlgorithm 2 }
+id-rsa-digest-md4 OBJECT IDENTIFIER ::= { id-rsa-digestAlgorithm 4 }
+id-rsa-digest-md5 OBJECT IDENTIFIER ::= { id-rsa-digestAlgorithm 5 }
+
 id-pkcs-3 OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840)
 	rsadsi(113549) pkcs(1) 3 }
 
@@ -43,13 +50,21 @@ id-rsadsi-des-ede3-cbc OBJECT IDENTIFIER ::=	{ id-rsadsi-encalg 7 }
 id-secsig-sha-1 OBJECT IDENTIFIER ::= { iso(1) identified-organization(3)
 	oiw(14) secsig(3) algorithm(2) 26 }
 
-id-nit-aes-algs OBJECT IDENTIFIER ::= {
-   joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3)
-   nistAlgorithm(4) 1 }
+id-nistAlgorithm OBJECT IDENTIFIER ::= {
+   joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) 4 }
+   
+id-nist-aes-algs OBJECT IDENTIFIER ::= { id-nistAlgorithm 1 }
 
-id-aes-128-cbc OBJECT IDENTIFIER ::=		{ id-nit-aes-algs 2 }
-id-aes-192-cbc OBJECT IDENTIFIER ::=		{ id-nit-aes-algs 22 }
-id-aes-256-cbc OBJECT IDENTIFIER ::=		{ id-nit-aes-algs 42 }
+id-aes-128-cbc OBJECT IDENTIFIER ::=		{ id-nist-aes-algs 2 }
+id-aes-192-cbc OBJECT IDENTIFIER ::=		{ id-nist-aes-algs 22 }
+id-aes-256-cbc OBJECT IDENTIFIER ::=		{ id-nist-aes-algs 42 }
+
+id-nist-sha-algs OBJECT IDENTIFIER ::=		{ id-nistAlgorithm 2 }
+
+id-sha256 OBJECT IDENTIFIER ::=			{ id-nist-sha-algs 1 }
+id-sha224 OBJECT IDENTIFIER ::=			{ id-nist-sha-algs 4 }
+id-sha384 OBJECT IDENTIFIER ::=			{ id-nist-sha-algs 2 }
+id-sha512 OBJECT IDENTIFIER ::=			{ id-nist-sha-algs 3 }
 
 id-dhpublicnumber OBJECT IDENTIFIER ::= {
         iso(1) member-body(2) us(840) ansi-x942(10046)