oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

add sha-1 and sha-2

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17142 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-04-21 21:00:14 +00:00
parent a373ad9424
commit 210a05bcee
2 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/asn1/Makefile.am
View File

@@ -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 \

27
lib/asn1/rfc2459.asn1
View File

@@ -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)