summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/objects
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/objects')
-rw-r--r--src/lib/libcrypto/objects/Makefile130
-rw-r--r--src/lib/libcrypto/objects/obj_mac.num27
-rw-r--r--src/lib/libcrypto/objects/objects.pl13
-rw-r--r--src/lib/libcrypto/objects/objects.txt41
4 files changed, 141 insertions, 70 deletions
diff --git a/src/lib/libcrypto/objects/Makefile b/src/lib/libcrypto/objects/Makefile
new file mode 100644
index 0000000000..a8aedbd422
--- /dev/null
+++ b/src/lib/libcrypto/objects/Makefile
@@ -0,0 +1,130 @@
1#
2# OpenSSL/crypto/objects/Makefile
3#
4
5DIR= objects
6TOP= ../..
7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g
10MAKEFILE= Makefile
11AR= ar r
12PERL= perl
13
14CFLAGS= $(INCLUDES) $(CFLAG)
15
16GENERAL=Makefile README
17TEST=
18APPS=
19
20LIB=$(TOP)/libcrypto.a
21LIBSRC= o_names.c obj_dat.c obj_lib.c obj_err.c obj_xref.c
22LIBOBJ= o_names.o obj_dat.o obj_lib.o obj_err.o obj_xref.o
23
24SRC= $(LIBSRC)
25
26EXHEADER= objects.h obj_mac.h
27HEADER= $(EXHEADER) obj_dat.h obj_xref.h
28
29ALL= $(GENERAL) $(SRC) $(HEADER)
30
31top:
32 (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
33
34all: obj_dat.h obj_xref.h lib
35
36lib: $(LIBOBJ)
37 $(AR) $(LIB) $(LIBOBJ)
38 $(RANLIB) $(LIB) || echo Never mind.
39 @touch lib
40
41obj_dat.h: obj_dat.pl obj_mac.h
42 $(PERL) obj_dat.pl obj_mac.h obj_dat.h
43
44# objects.pl both reads and writes obj_mac.num
45obj_mac.h: objects.pl objects.txt obj_mac.num
46 $(PERL) objects.pl objects.txt obj_mac.num obj_mac.h
47 @sleep 1; touch obj_mac.h; sleep 1
48
49obj_xref.h: objxref.pl obj_xref.txt obj_mac.num
50 $(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h
51 @sleep 1; touch obj_xref.h; sleep 1
52
53files:
54 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
55
56links:
57 @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
58 @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
59 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
60
61install:
62 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
63 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
64 do \
65 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
66 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
67 done;
68
69tags:
70 ctags $(SRC)
71
72tests:
73
74lint:
75 lint -DLINT $(INCLUDES) $(SRC)>fluff
76
77depend:
78 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
79 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
80
81dclean:
82 $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
83 mv -f Makefile.new $(MAKEFILE)
84
85clean:
86 rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
87
88# DO NOT DELETE THIS LINE -- make depend depends on it.
89
90o_names.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
91o_names.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
92o_names.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
93o_names.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
94o_names.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
95o_names.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
96o_names.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
97o_names.o: o_names.c
98obj_dat.o: ../../e_os.h ../../include/openssl/asn1.h
99obj_dat.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
100obj_dat.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
101obj_dat.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
102obj_dat.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
103obj_dat.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
104obj_dat.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
105obj_dat.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
106obj_dat.o: ../../include/openssl/symhacks.h ../cryptlib.h obj_dat.c obj_dat.h
107obj_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
108obj_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
109obj_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
110obj_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
111obj_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
112obj_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
113obj_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
114obj_err.o: obj_err.c
115obj_lib.o: ../../e_os.h ../../include/openssl/asn1.h
116obj_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
117obj_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
118obj_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
119obj_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
120obj_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
121obj_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
122obj_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
123obj_lib.o: ../cryptlib.h obj_lib.c
124obj_xref.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
125obj_xref.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
126obj_xref.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
127obj_xref.o: ../../include/openssl/opensslconf.h
128obj_xref.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
129obj_xref.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
130obj_xref.o: ../../include/openssl/symhacks.h obj_xref.c obj_xref.h
diff --git a/src/lib/libcrypto/objects/obj_mac.num b/src/lib/libcrypto/objects/obj_mac.num
index 1d0a7c802d..8c50aac27f 100644
--- a/src/lib/libcrypto/objects/obj_mac.num
+++ b/src/lib/libcrypto/objects/obj_mac.num
@@ -890,30 +890,3 @@ houseIdentifier 889
890supportedAlgorithms 890 890supportedAlgorithms 890
891deltaRevocationList 891 891deltaRevocationList 891
892dmdName 892 892dmdName 892
893id_alg_PWRI_KEK 893
894cmac 894
895aes_128_gcm 895
896aes_128_ccm 896
897id_aes128_wrap_pad 897
898aes_192_gcm 898
899aes_192_ccm 899
900id_aes192_wrap_pad 900
901aes_256_gcm 901
902aes_256_ccm 902
903id_aes256_wrap_pad 903
904aes_128_ctr 904
905aes_192_ctr 905
906aes_256_ctr 906
907id_camellia128_wrap 907
908id_camellia192_wrap 908
909id_camellia256_wrap 909
910anyExtendedKeyUsage 910
911mgf1 911
912rsassaPss 912
913aes_128_xts 913
914aes_256_xts 914
915rc4_hmac_md5 915
916aes_128_cbc_hmac_sha1 916
917aes_192_cbc_hmac_sha1 917
918aes_256_cbc_hmac_sha1 918
919rsaesOaep 919
diff --git a/src/lib/libcrypto/objects/objects.pl b/src/lib/libcrypto/objects/objects.pl
index 15c00bbd52..d2bf659d88 100644
--- a/src/lib/libcrypto/objects/objects.pl
+++ b/src/lib/libcrypto/objects/objects.pl
@@ -110,12 +110,13 @@ print STDERR "Added OID $Cname\n";
110 } 110 }
111close IN; 111close IN;
112 112
113open (NUMOUT,">$ARGV[1]") || die "Can't open output file $ARGV[1]"; 113#XXX don't modify input files
114foreach (sort { $a <=> $b } keys %nidn) 114#open (NUMOUT,">$ARGV[1]") || die "Can't open output file $ARGV[1]";
115 { 115#foreach (sort { $a <=> $b } keys %nidn)
116 print NUMOUT $nidn{$_},"\t\t",$_,"\n"; 116# {
117 } 117# print NUMOUT $nidn{$_},"\t\t",$_,"\n";
118close NUMOUT; 118# }
119#close NUMOUT;
119 120
120open (OUT,">$ARGV[2]") || die "Can't open output file $ARGV[2]"; 121open (OUT,">$ARGV[2]") || die "Can't open output file $ARGV[2]";
121print OUT <<'EOF'; 122print OUT <<'EOF';
diff --git a/src/lib/libcrypto/objects/objects.txt b/src/lib/libcrypto/objects/objects.txt
index d3bfad72a2..e61fe60cbf 100644
--- a/src/lib/libcrypto/objects/objects.txt
+++ b/src/lib/libcrypto/objects/objects.txt
@@ -166,10 +166,6 @@ pkcs1 3 : RSA-MD4 : md4WithRSAEncryption
166pkcs1 4 : RSA-MD5 : md5WithRSAEncryption 166pkcs1 4 : RSA-MD5 : md5WithRSAEncryption
167pkcs1 5 : RSA-SHA1 : sha1WithRSAEncryption 167pkcs1 5 : RSA-SHA1 : sha1WithRSAEncryption
168# According to PKCS #1 version 2.1 168# According to PKCS #1 version 2.1
169pkcs1 7 : RSAES-OAEP : rsaesOaep
170pkcs1 8 : MGF1 : mgf1
171pkcs1 10 : RSASSA-PSS : rsassaPss
172
173pkcs1 11 : RSA-SHA256 : sha256WithRSAEncryption 169pkcs1 11 : RSA-SHA256 : sha256WithRSAEncryption
174pkcs1 12 : RSA-SHA384 : sha384WithRSAEncryption 170pkcs1 12 : RSA-SHA384 : sha384WithRSAEncryption
175pkcs1 13 : RSA-SHA512 : sha512WithRSAEncryption 171pkcs1 13 : RSA-SHA512 : sha512WithRSAEncryption
@@ -303,7 +299,6 @@ id-smime-alg 4 : id-smime-alg-RC2wrap
303id-smime-alg 5 : id-smime-alg-ESDH 299id-smime-alg 5 : id-smime-alg-ESDH
304id-smime-alg 6 : id-smime-alg-CMS3DESwrap 300id-smime-alg 6 : id-smime-alg-CMS3DESwrap
305id-smime-alg 7 : id-smime-alg-CMSRC2wrap 301id-smime-alg 7 : id-smime-alg-CMSRC2wrap
306id-smime-alg 9 : id-alg-PWRI-KEK
307 302
308# S/MIME Certificate Distribution 303# S/MIME Certificate Distribution
309id-smime-cd 1 : id-smime-cd-ldap 304id-smime-cd 1 : id-smime-cd-ldap
@@ -775,10 +770,6 @@ id-ce 55 : targetInformation : X509v3 AC Targeting
775!Cname no-rev-avail 770!Cname no-rev-avail
776id-ce 56 : noRevAvail : X509v3 No Revocation Available 771id-ce 56 : noRevAvail : X509v3 No Revocation Available
777 772
778# From RFC5280
779ext-key-usage 0 : anyExtendedKeyUsage : Any Extended Key Usage
780
781
782!Cname netscape 773!Cname netscape
7832 16 840 1 113730 : Netscape : Netscape Communications Corp. 7742 16 840 1 113730 : Netscape : Netscape Communications Corp.
784!Cname netscape-cert-extension 775!Cname netscape-cert-extension
@@ -855,10 +846,6 @@ aes 2 : AES-128-CBC : aes-128-cbc
855aes 3 : AES-128-OFB : aes-128-ofb 846aes 3 : AES-128-OFB : aes-128-ofb
856!Cname aes-128-cfb128 847!Cname aes-128-cfb128
857aes 4 : AES-128-CFB : aes-128-cfb 848aes 4 : AES-128-CFB : aes-128-cfb
858aes 5 : id-aes128-wrap
859aes 6 : id-aes128-GCM : aes-128-gcm
860aes 7 : id-aes128-CCM : aes-128-ccm
861aes 8 : id-aes128-wrap-pad
862 849
863aes 21 : AES-192-ECB : aes-192-ecb 850aes 21 : AES-192-ECB : aes-192-ecb
864aes 22 : AES-192-CBC : aes-192-cbc 851aes 22 : AES-192-CBC : aes-192-cbc
@@ -866,10 +853,6 @@ aes 22 : AES-192-CBC : aes-192-cbc
866aes 23 : AES-192-OFB : aes-192-ofb 853aes 23 : AES-192-OFB : aes-192-ofb
867!Cname aes-192-cfb128 854!Cname aes-192-cfb128
868aes 24 : AES-192-CFB : aes-192-cfb 855aes 24 : AES-192-CFB : aes-192-cfb
869aes 25 : id-aes192-wrap
870aes 26 : id-aes192-GCM : aes-192-gcm
871aes 27 : id-aes192-CCM : aes-192-ccm
872aes 28 : id-aes192-wrap-pad
873 856
874aes 41 : AES-256-ECB : aes-256-ecb 857aes 41 : AES-256-ECB : aes-256-ecb
875aes 42 : AES-256-CBC : aes-256-cbc 858aes 42 : AES-256-CBC : aes-256-cbc
@@ -877,10 +860,6 @@ aes 42 : AES-256-CBC : aes-256-cbc
877aes 43 : AES-256-OFB : aes-256-ofb 860aes 43 : AES-256-OFB : aes-256-ofb
878!Cname aes-256-cfb128 861!Cname aes-256-cfb128
879aes 44 : AES-256-CFB : aes-256-cfb 862aes 44 : AES-256-CFB : aes-256-cfb
880aes 45 : id-aes256-wrap
881aes 46 : id-aes256-GCM : aes-256-gcm
882aes 47 : id-aes256-CCM : aes-256-ccm
883aes 48 : id-aes256-wrap-pad
884 863
885# There are no OIDs for these modes... 864# There are no OIDs for these modes...
886 865
@@ -890,16 +869,15 @@ aes 48 : id-aes256-wrap-pad
890 : AES-128-CFB8 : aes-128-cfb8 869 : AES-128-CFB8 : aes-128-cfb8
891 : AES-192-CFB8 : aes-192-cfb8 870 : AES-192-CFB8 : aes-192-cfb8
892 : AES-256-CFB8 : aes-256-cfb8 871 : AES-256-CFB8 : aes-256-cfb8
893 : AES-128-CTR : aes-128-ctr
894 : AES-192-CTR : aes-192-ctr
895 : AES-256-CTR : aes-256-ctr
896 : AES-128-XTS : aes-128-xts
897 : AES-256-XTS : aes-256-xts
898 : DES-CFB1 : des-cfb1 872 : DES-CFB1 : des-cfb1
899 : DES-CFB8 : des-cfb8 873 : DES-CFB8 : des-cfb8
900 : DES-EDE3-CFB1 : des-ede3-cfb1 874 : DES-EDE3-CFB1 : des-ede3-cfb1
901 : DES-EDE3-CFB8 : des-ede3-cfb8 875 : DES-EDE3-CFB8 : des-ede3-cfb8
902 876
877aes 5 : id-aes128-wrap
878aes 25 : id-aes192-wrap
879aes 45 : id-aes256-wrap
880
903# OIDs for SHA224, SHA256, SHA385 and SHA512, according to x9.84. 881# OIDs for SHA224, SHA256, SHA385 and SHA512, according to x9.84.
904!Alias nist_hashalgs nistAlgorithms 2 882!Alias nist_hashalgs nistAlgorithms 2
905nist_hashalgs 1 : SHA256 : sha256 883nist_hashalgs 1 : SHA256 : sha256
@@ -1233,9 +1211,6 @@ cryptocom 1 8 1 : id-GostR3410-2001-ParamSet-cc : GOST R 3410-2001 Parameter Se
12331 2 392 200011 61 1 1 1 2 : CAMELLIA-128-CBC : camellia-128-cbc 12111 2 392 200011 61 1 1 1 2 : CAMELLIA-128-CBC : camellia-128-cbc
12341 2 392 200011 61 1 1 1 3 : CAMELLIA-192-CBC : camellia-192-cbc 12121 2 392 200011 61 1 1 1 3 : CAMELLIA-192-CBC : camellia-192-cbc
12351 2 392 200011 61 1 1 1 4 : CAMELLIA-256-CBC : camellia-256-cbc 12131 2 392 200011 61 1 1 1 4 : CAMELLIA-256-CBC : camellia-256-cbc
12361 2 392 200011 61 1 1 3 2 : id-camellia128-wrap
12371 2 392 200011 61 1 1 3 3 : id-camellia192-wrap
12381 2 392 200011 61 1 1 3 4 : id-camellia256-wrap
1239 1214
1240# Definitions for Camellia cipher - ECB, CFB, OFB MODE 1215# Definitions for Camellia cipher - ECB, CFB, OFB MODE
1241 1216
@@ -1282,11 +1257,3 @@ kisa 1 6 : SEED-OFB : seed-ofb
1282# There is no OID that just denotes "HMAC" oddly enough... 1257# There is no OID that just denotes "HMAC" oddly enough...
1283 1258
1284 : HMAC : hmac 1259 : HMAC : hmac
1285# Nor CMAC either
1286 : CMAC : cmac
1287
1288# Synthetic composite ciphersuites
1289 : RC4-HMAC-MD5 : rc4-hmac-md5
1290 : AES-128-CBC-HMAC-SHA1 : aes-128-cbc-hmac-sha1
1291 : AES-192-CBC-HMAC-SHA1 : aes-192-cbc-hmac-sha1
1292 : AES-256-CBC-HMAC-SHA1 : aes-256-cbc-hmac-sha1