diff options
Diffstat (limited to 'src/lib/libcrypto/objects')
-rw-r--r-- | src/lib/libcrypto/objects/Makefile | 122 | ||||
-rw-r--r-- | src/lib/libcrypto/objects/Makefile.ssl | 123 | ||||
-rw-r--r-- | src/lib/libcrypto/objects/obj_err.c | 28 | ||||
-rw-r--r-- | src/lib/libcrypto/objects/obj_mac.num | 16 | ||||
-rw-r--r-- | src/lib/libcrypto/objects/objects.pl | 13 | ||||
-rw-r--r-- | src/lib/libcrypto/objects/objects.txt | 20 |
6 files changed, 271 insertions, 51 deletions
diff --git a/src/lib/libcrypto/objects/Makefile b/src/lib/libcrypto/objects/Makefile new file mode 100644 index 0000000000..23b2a69e6d --- /dev/null +++ b/src/lib/libcrypto/objects/Makefile | |||
@@ -0,0 +1,122 @@ | |||
1 | # | ||
2 | # OpenSSL/crypto/objects/Makefile | ||
3 | # | ||
4 | |||
5 | DIR= objects | ||
6 | TOP= ../.. | ||
7 | CC= cc | ||
8 | INCLUDES= -I.. -I$(TOP) -I../../include | ||
9 | CFLAG=-g | ||
10 | INSTALL_PREFIX= | ||
11 | OPENSSLDIR= /usr/local/ssl | ||
12 | INSTALLTOP=/usr/local/ssl | ||
13 | MAKEDEPPROG= makedepend | ||
14 | MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) | ||
15 | MAKEFILE= Makefile | ||
16 | AR= ar r | ||
17 | PERL= perl | ||
18 | |||
19 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
20 | |||
21 | GENERAL=Makefile README | ||
22 | TEST= | ||
23 | APPS= | ||
24 | |||
25 | LIB=$(TOP)/libcrypto.a | ||
26 | LIBSRC= o_names.c obj_dat.c obj_lib.c obj_err.c | ||
27 | LIBOBJ= o_names.o obj_dat.o obj_lib.o obj_err.o | ||
28 | |||
29 | SRC= $(LIBSRC) | ||
30 | |||
31 | EXHEADER= objects.h obj_mac.h | ||
32 | HEADER= $(EXHEADER) obj_dat.h | ||
33 | |||
34 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
35 | |||
36 | top: | ||
37 | (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) | ||
38 | |||
39 | all: obj_dat.h lib | ||
40 | |||
41 | lib: $(LIBOBJ) | ||
42 | $(AR) $(LIB) $(LIBOBJ) | ||
43 | $(RANLIB) $(LIB) || echo Never mind. | ||
44 | @touch lib | ||
45 | |||
46 | obj_dat.h: obj_dat.pl obj_mac.h | ||
47 | $(PERL) obj_dat.pl obj_mac.h obj_dat.h | ||
48 | |||
49 | # objects.pl both reads and writes obj_mac.num | ||
50 | obj_mac.h: objects.pl objects.txt obj_mac.num | ||
51 | $(PERL) objects.pl objects.txt obj_mac.num obj_mac.h | ||
52 | @sleep 1; touch obj_mac.h; sleep 1 | ||
53 | |||
54 | files: | ||
55 | $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO | ||
56 | |||
57 | links: | ||
58 | @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) | ||
59 | @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) | ||
60 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) | ||
61 | |||
62 | install: | ||
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 | |||
69 | tags: | ||
70 | ctags $(SRC) | ||
71 | |||
72 | tests: | ||
73 | |||
74 | lint: | ||
75 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
76 | |||
77 | depend: | ||
78 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) | ||
79 | |||
80 | dclean: | ||
81 | $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
82 | mv -f Makefile.new $(MAKEFILE) | ||
83 | |||
84 | clean: | ||
85 | rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
86 | |||
87 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
88 | |||
89 | o_names.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | ||
90 | o_names.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h | ||
91 | o_names.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
92 | o_names.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | ||
93 | o_names.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | ||
94 | o_names.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
95 | o_names.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
96 | o_names.o: ../../include/openssl/symhacks.h o_names.c | ||
97 | obj_dat.o: ../../e_os.h ../../include/openssl/asn1.h | ||
98 | obj_dat.o: ../../include/openssl/bio.h ../../include/openssl/bn.h | ||
99 | obj_dat.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
100 | obj_dat.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
101 | obj_dat.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | ||
102 | obj_dat.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | ||
103 | obj_dat.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
104 | obj_dat.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
105 | obj_dat.o: ../../include/openssl/symhacks.h ../cryptlib.h obj_dat.c obj_dat.h | ||
106 | obj_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | ||
107 | obj_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h | ||
108 | obj_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
109 | obj_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | ||
110 | obj_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | ||
111 | obj_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
112 | obj_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
113 | obj_err.o: ../../include/openssl/symhacks.h obj_err.c | ||
114 | obj_lib.o: ../../e_os.h ../../include/openssl/asn1.h | ||
115 | obj_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h | ||
116 | obj_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
117 | obj_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
118 | obj_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | ||
119 | obj_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | ||
120 | obj_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
121 | obj_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
122 | obj_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h obj_lib.c | ||
diff --git a/src/lib/libcrypto/objects/Makefile.ssl b/src/lib/libcrypto/objects/Makefile.ssl new file mode 100644 index 0000000000..3e7a194cf9 --- /dev/null +++ b/src/lib/libcrypto/objects/Makefile.ssl | |||
@@ -0,0 +1,123 @@ | |||
1 | # | ||
2 | # SSLeay/crypto/objects/Makefile | ||
3 | # | ||
4 | |||
5 | DIR= objects | ||
6 | TOP= ../.. | ||
7 | CC= cc | ||
8 | INCLUDES= -I.. -I$(TOP) -I../../include | ||
9 | CFLAG=-g | ||
10 | INSTALL_PREFIX= | ||
11 | OPENSSLDIR= /usr/local/ssl | ||
12 | INSTALLTOP=/usr/local/ssl | ||
13 | MAKE= make -f Makefile.ssl | ||
14 | MAKEDEPPROG= makedepend | ||
15 | MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) | ||
16 | MAKEFILE= Makefile.ssl | ||
17 | AR= ar r | ||
18 | PERL= perl | ||
19 | |||
20 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
21 | |||
22 | GENERAL=Makefile README | ||
23 | TEST= | ||
24 | APPS= | ||
25 | |||
26 | LIB=$(TOP)/libcrypto.a | ||
27 | LIBSRC= o_names.c obj_dat.c obj_lib.c obj_err.c | ||
28 | LIBOBJ= o_names.o obj_dat.o obj_lib.o obj_err.o | ||
29 | |||
30 | SRC= $(LIBSRC) | ||
31 | |||
32 | EXHEADER= objects.h obj_mac.h | ||
33 | HEADER= $(EXHEADER) obj_dat.h | ||
34 | |||
35 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
36 | |||
37 | top: | ||
38 | (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) | ||
39 | |||
40 | all: obj_dat.h lib | ||
41 | |||
42 | lib: $(LIBOBJ) | ||
43 | $(AR) $(LIB) $(LIBOBJ) | ||
44 | $(RANLIB) $(LIB) || echo Never mind. | ||
45 | @touch lib | ||
46 | |||
47 | obj_dat.h: obj_dat.pl obj_mac.h | ||
48 | $(PERL) obj_dat.pl obj_mac.h obj_dat.h | ||
49 | |||
50 | # objects.pl both reads and writes obj_mac.num | ||
51 | obj_mac.h: objects.pl objects.txt obj_mac.num | ||
52 | $(PERL) objects.pl objects.txt obj_mac.num obj_mac.h | ||
53 | |||
54 | files: | ||
55 | $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO | ||
56 | |||
57 | links: | ||
58 | @sh $(TOP)/util/point.sh Makefile.ssl Makefile | ||
59 | @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) | ||
60 | @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) | ||
61 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) | ||
62 | |||
63 | install: | ||
64 | @for i in $(EXHEADER) ; \ | ||
65 | do \ | ||
66 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | ||
67 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ | ||
68 | done; | ||
69 | |||
70 | tags: | ||
71 | ctags $(SRC) | ||
72 | |||
73 | tests: | ||
74 | |||
75 | lint: | ||
76 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
77 | |||
78 | depend: | ||
79 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) | ||
80 | |||
81 | dclean: | ||
82 | $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
83 | mv -f Makefile.new $(MAKEFILE) | ||
84 | |||
85 | clean: | ||
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 | |||
90 | o_names.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | ||
91 | o_names.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h | ||
92 | o_names.o: ../../include/openssl/e_os2.h ../../include/openssl/lhash.h | ||
93 | o_names.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | ||
94 | o_names.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | ||
95 | o_names.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h | ||
96 | o_names.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
97 | o_names.o: o_names.c | ||
98 | obj_dat.o: ../../e_os.h ../../include/openssl/asn1.h | ||
99 | obj_dat.o: ../../include/openssl/bio.h ../../include/openssl/bn.h | ||
100 | obj_dat.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
101 | obj_dat.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
102 | obj_dat.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | ||
103 | obj_dat.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | ||
104 | obj_dat.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
105 | obj_dat.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
106 | obj_dat.o: ../../include/openssl/symhacks.h ../cryptlib.h obj_dat.c obj_dat.h | ||
107 | obj_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | ||
108 | obj_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h | ||
109 | obj_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
110 | obj_err.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | ||
111 | obj_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | ||
112 | obj_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
113 | obj_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
114 | obj_err.o: ../../include/openssl/symhacks.h obj_err.c | ||
115 | obj_lib.o: ../../e_os.h ../../include/openssl/asn1.h | ||
116 | obj_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h | ||
117 | obj_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
118 | obj_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
119 | obj_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | ||
120 | obj_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | ||
121 | obj_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
122 | obj_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
123 | obj_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h obj_lib.c | ||
diff --git a/src/lib/libcrypto/objects/obj_err.c b/src/lib/libcrypto/objects/obj_err.c index 0682979b38..2b5f43e3cc 100644 --- a/src/lib/libcrypto/objects/obj_err.c +++ b/src/lib/libcrypto/objects/obj_err.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* crypto/objects/obj_err.c */ | 1 | /* crypto/objects/obj_err.c */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2004 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions | 6 | * modification, are permitted provided that the following conditions |
@@ -64,26 +64,22 @@ | |||
64 | 64 | ||
65 | /* BEGIN ERROR CODES */ | 65 | /* BEGIN ERROR CODES */ |
66 | #ifndef OPENSSL_NO_ERR | 66 | #ifndef OPENSSL_NO_ERR |
67 | |||
68 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_OBJ,func,0) | ||
69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_OBJ,0,reason) | ||
70 | |||
71 | static ERR_STRING_DATA OBJ_str_functs[]= | 67 | static ERR_STRING_DATA OBJ_str_functs[]= |
72 | { | 68 | { |
73 | {ERR_FUNC(OBJ_F_OBJ_ADD_OBJECT), "OBJ_add_object"}, | 69 | {ERR_PACK(0,OBJ_F_OBJ_ADD_OBJECT,0), "OBJ_add_object"}, |
74 | {ERR_FUNC(OBJ_F_OBJ_CREATE), "OBJ_create"}, | 70 | {ERR_PACK(0,OBJ_F_OBJ_CREATE,0), "OBJ_create"}, |
75 | {ERR_FUNC(OBJ_F_OBJ_DUP), "OBJ_dup"}, | 71 | {ERR_PACK(0,OBJ_F_OBJ_DUP,0), "OBJ_dup"}, |
76 | {ERR_FUNC(OBJ_F_OBJ_NAME_NEW_INDEX), "OBJ_NAME_new_index"}, | 72 | {ERR_PACK(0,OBJ_F_OBJ_NAME_NEW_INDEX,0), "OBJ_NAME_new_index"}, |
77 | {ERR_FUNC(OBJ_F_OBJ_NID2LN), "OBJ_nid2ln"}, | 73 | {ERR_PACK(0,OBJ_F_OBJ_NID2LN,0), "OBJ_nid2ln"}, |
78 | {ERR_FUNC(OBJ_F_OBJ_NID2OBJ), "OBJ_nid2obj"}, | 74 | {ERR_PACK(0,OBJ_F_OBJ_NID2OBJ,0), "OBJ_nid2obj"}, |
79 | {ERR_FUNC(OBJ_F_OBJ_NID2SN), "OBJ_nid2sn"}, | 75 | {ERR_PACK(0,OBJ_F_OBJ_NID2SN,0), "OBJ_nid2sn"}, |
80 | {0,NULL} | 76 | {0,NULL} |
81 | }; | 77 | }; |
82 | 78 | ||
83 | static ERR_STRING_DATA OBJ_str_reasons[]= | 79 | static ERR_STRING_DATA OBJ_str_reasons[]= |
84 | { | 80 | { |
85 | {ERR_REASON(OBJ_R_MALLOC_FAILURE) ,"malloc failure"}, | 81 | {OBJ_R_MALLOC_FAILURE ,"malloc failure"}, |
86 | {ERR_REASON(OBJ_R_UNKNOWN_NID) ,"unknown nid"}, | 82 | {OBJ_R_UNKNOWN_NID ,"unknown nid"}, |
87 | {0,NULL} | 83 | {0,NULL} |
88 | }; | 84 | }; |
89 | 85 | ||
@@ -97,8 +93,8 @@ void ERR_load_OBJ_strings(void) | |||
97 | { | 93 | { |
98 | init=0; | 94 | init=0; |
99 | #ifndef OPENSSL_NO_ERR | 95 | #ifndef OPENSSL_NO_ERR |
100 | ERR_load_strings(0,OBJ_str_functs); | 96 | ERR_load_strings(ERR_LIB_OBJ,OBJ_str_functs); |
101 | ERR_load_strings(0,OBJ_str_reasons); | 97 | ERR_load_strings(ERR_LIB_OBJ,OBJ_str_reasons); |
102 | #endif | 98 | #endif |
103 | 99 | ||
104 | } | 100 | } |
diff --git a/src/lib/libcrypto/objects/obj_mac.num b/src/lib/libcrypto/objects/obj_mac.num index 84555d936e..0e64a929ba 100644 --- a/src/lib/libcrypto/objects/obj_mac.num +++ b/src/lib/libcrypto/objects/obj_mac.num | |||
@@ -287,9 +287,9 @@ qcStatements 286 | |||
287 | ac_auditEntity 287 | 287 | ac_auditEntity 287 |
288 | ac_targeting 288 | 288 | ac_targeting 288 |
289 | aaControls 289 | 289 | aaControls 289 |
290 | sbgp_ipAddrBlock 290 | 290 | sbqp_ipAddrBlock 290 |
291 | sbgp_autonomousSysNum 291 | 291 | sbqp_autonomousSysNum 291 |
292 | sbgp_routerIdentifier 292 | 292 | sbqp_routerIdentifier 292 |
293 | textNotice 293 | 293 | textNotice 293 |
294 | ipsecEndSystem 294 | 294 | ipsecEndSystem 294 |
295 | ipsecTunnel 295 | 295 | ipsecTunnel 295 |
@@ -663,13 +663,5 @@ id_ppl 662 | |||
663 | proxyCertInfo 663 | 663 | proxyCertInfo 663 |
664 | id_ppl_anyLanguage 664 | 664 | id_ppl_anyLanguage 664 |
665 | id_ppl_inheritAll 665 | 665 | id_ppl_inheritAll 665 |
666 | name_constraints 666 | 666 | id_ppl_independent 666 |
667 | Independent 667 | 667 | Independent 667 |
668 | sha256WithRSAEncryption 668 | ||
669 | sha384WithRSAEncryption 669 | ||
670 | sha512WithRSAEncryption 670 | ||
671 | sha224WithRSAEncryption 671 | ||
672 | sha256 672 | ||
673 | sha384 673 | ||
674 | sha512 674 | ||
675 | sha224 675 | ||
diff --git a/src/lib/libcrypto/objects/objects.pl b/src/lib/libcrypto/objects/objects.pl index 76c06cc8f9..76bb8da677 100644 --- a/src/lib/libcrypto/objects/objects.pl +++ b/src/lib/libcrypto/objects/objects.pl | |||
@@ -107,12 +107,13 @@ while (<IN>) | |||
107 | } | 107 | } |
108 | close IN; | 108 | close IN; |
109 | 109 | ||
110 | open (NUMOUT,">$ARGV[1]") || die "Can't open output file $ARGV[1]"; | 110 | #XXX don't modify input files |
111 | foreach (sort { $a <=> $b } keys %nidn) | 111 | #open (NUMOUT,">$ARGV[1]") || die "Can't open output file $ARGV[1]"; |
112 | { | 112 | #foreach (sort { $a <=> $b } keys %nidn) |
113 | print NUMOUT $nidn{$_},"\t\t",$_,"\n"; | 113 | # { |
114 | } | 114 | # print NUMOUT $nidn{$_},"\t\t",$_,"\n"; |
115 | close NUMOUT; | 115 | # } |
116 | #close NUMOUT; | ||
116 | 117 | ||
117 | open (OUT,">$ARGV[2]") || die "Can't open output file $ARGV[2]"; | 118 | open (OUT,">$ARGV[2]") || die "Can't open output file $ARGV[2]"; |
118 | print OUT <<'EOF'; | 119 | print OUT <<'EOF'; |
diff --git a/src/lib/libcrypto/objects/objects.txt b/src/lib/libcrypto/objects/objects.txt index 2635c4e667..50e9031e61 100644 --- a/src/lib/libcrypto/objects/objects.txt +++ b/src/lib/libcrypto/objects/objects.txt | |||
@@ -63,11 +63,6 @@ pkcs1 2 : RSA-MD2 : md2WithRSAEncryption | |||
63 | pkcs1 3 : RSA-MD4 : md4WithRSAEncryption | 63 | pkcs1 3 : RSA-MD4 : md4WithRSAEncryption |
64 | pkcs1 4 : RSA-MD5 : md5WithRSAEncryption | 64 | pkcs1 4 : RSA-MD5 : md5WithRSAEncryption |
65 | pkcs1 5 : RSA-SHA1 : sha1WithRSAEncryption | 65 | pkcs1 5 : RSA-SHA1 : sha1WithRSAEncryption |
66 | # According to PKCS #1 version 2.1 | ||
67 | pkcs1 11 : RSA-SHA256 : sha256WithRSAEncryption | ||
68 | pkcs1 12 : RSA-SHA384 : sha384WithRSAEncryption | ||
69 | pkcs1 13 : RSA-SHA512 : sha512WithRSAEncryption | ||
70 | pkcs1 14 : RSA-SHA224 : sha224WithRSAEncryption | ||
71 | 66 | ||
72 | pkcs 3 : pkcs3 | 67 | pkcs 3 : pkcs3 |
73 | pkcs3 1 : : dhKeyAgreement | 68 | pkcs3 1 : : dhKeyAgreement |
@@ -346,9 +341,9 @@ id-pe 3 : qcStatements | |||
346 | id-pe 4 : ac-auditEntity | 341 | id-pe 4 : ac-auditEntity |
347 | id-pe 5 : ac-targeting | 342 | id-pe 5 : ac-targeting |
348 | id-pe 6 : aaControls | 343 | id-pe 6 : aaControls |
349 | id-pe 7 : sbgp-ipAddrBlock | 344 | id-pe 7 : sbqp-ipAddrBlock |
350 | id-pe 8 : sbgp-autonomousSysNum | 345 | id-pe 8 : sbqp-autonomousSysNum |
351 | id-pe 9 : sbgp-routerIdentifier | 346 | id-pe 9 : sbqp-routerIdentifier |
352 | id-pe 10 : ac-proxying | 347 | id-pe 10 : ac-proxying |
353 | !Cname sinfo-access | 348 | !Cname sinfo-access |
354 | id-pe 11 : subjectInfoAccess : Subject Information Access | 349 | id-pe 11 : subjectInfoAccess : Subject Information Access |
@@ -589,8 +584,6 @@ id-ce 21 : CRLReason : X509v3 CRL Reason Code | |||
589 | id-ce 24 : invalidityDate : Invalidity Date | 584 | id-ce 24 : invalidityDate : Invalidity Date |
590 | !Cname delta-crl | 585 | !Cname delta-crl |
591 | id-ce 27 : deltaCRL : X509v3 Delta CRL Indicator | 586 | id-ce 27 : deltaCRL : X509v3 Delta CRL Indicator |
592 | !Cname name-constraints | ||
593 | id-ce 30 : nameConstraints : X509v3 Name Constraints | ||
594 | !Cname crl-distribution-points | 587 | !Cname crl-distribution-points |
595 | id-ce 31 : crlDistributionPoints : X509v3 CRL Distribution Points | 588 | id-ce 31 : crlDistributionPoints : X509v3 CRL Distribution Points |
596 | !Cname certificate-policies | 589 | !Cname certificate-policies |
@@ -710,13 +703,6 @@ aes 44 : AES-256-CFB : aes-256-cfb | |||
710 | : DES-EDE3-CFB1 : des-ede3-cfb1 | 703 | : DES-EDE3-CFB1 : des-ede3-cfb1 |
711 | : DES-EDE3-CFB8 : des-ede3-cfb8 | 704 | : DES-EDE3-CFB8 : des-ede3-cfb8 |
712 | 705 | ||
713 | # OIDs for SHA224, SHA256, SHA385 and SHA512, according to x9.84. | ||
714 | !Alias nist_hashalgs nistAlgorithms 2 | ||
715 | nist_hashalgs 1 : SHA256 : sha256 | ||
716 | nist_hashalgs 2 : SHA384 : sha384 | ||
717 | nist_hashalgs 3 : SHA512 : sha512 | ||
718 | nist_hashalgs 4 : SHA224 : sha224 | ||
719 | |||
720 | # Hold instruction CRL entry extension | 706 | # Hold instruction CRL entry extension |
721 | !Cname hold-instruction-code | 707 | !Cname hold-instruction-code |
722 | id-ce 23 : holdInstructionCode : Hold Instruction Code | 708 | id-ce 23 : holdInstructionCode : Hold Instruction Code |