summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2015-02-10 09:52:16 +0000
committerjsing <>2015-02-10 09:52:16 +0000
commit9c8f4b278d0fe6c5ae67ecea60905c57ccf4c4e1 (patch)
treee4da3dec3bfbc941cd1e719066769fc36817428b
parent1f7dfb602e769ed1eeca26bf4fd6fb999ae8ddb1 (diff)
downloadopenbsd-9c8f4b278d0fe6c5ae67ecea60905c57ccf4c4e1.tar.gz
openbsd-9c8f4b278d0fe6c5ae67ecea60905c57ccf4c4e1.tar.bz2
openbsd-9c8f4b278d0fe6c5ae67ecea60905c57ccf4c4e1.zip
Remove default value initialisers for ASN1_ITEM. Minor changes to generated
assembly due to switches between .quad and .zero for structs.
Diffstat
-rw-r--r--src/lib/libcrypto/asn1/tasn_typ.c104
-rw-r--r--src/lib/libssl/src/crypto/asn1/tasn_typ.c104
2 files changed, 22 insertions, 186 deletions
diff --git a/src/lib/libcrypto/asn1/tasn_typ.c b/src/lib/libcrypto/asn1/tasn_typ.c
index 0e2aac1788..5b8b4f79f6 100644
--- a/src/lib/libcrypto/asn1/tasn_typ.c
+++ b/src/lib/libcrypto/asn1/tasn_typ.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tasn_typ.c,v 1.10 2015/02/10 09:39:13 jsing Exp $ */ 1/* $OpenBSD: tasn_typ.c,v 1.11 2015/02/10 09:52:16 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -61,15 +61,9 @@
61 61
62/* Declarations for string types */ 62/* Declarations for string types */
63 63
64
65
66const ASN1_ITEM ASN1_INTEGER_it = { 64const ASN1_ITEM ASN1_INTEGER_it = {
67 .itype = ASN1_ITYPE_PRIMITIVE, 65 .itype = ASN1_ITYPE_PRIMITIVE,
68 .utype = V_ASN1_INTEGER, 66 .utype = V_ASN1_INTEGER,
69 .templates = NULL,
70 .tcount = 0,
71 .funcs = NULL,
72 .size = 0,
73 .sname = "ASN1_INTEGER", 67 .sname = "ASN1_INTEGER",
74}; 68};
75 69
@@ -102,10 +96,6 @@ ASN1_INTEGER_free(ASN1_INTEGER *a)
102const ASN1_ITEM ASN1_ENUMERATED_it = { 96const ASN1_ITEM ASN1_ENUMERATED_it = {
103 .itype = ASN1_ITYPE_PRIMITIVE, 97 .itype = ASN1_ITYPE_PRIMITIVE,
104 .utype = V_ASN1_ENUMERATED, 98 .utype = V_ASN1_ENUMERATED,
105 .templates = NULL,
106 .tcount = 0,
107 .funcs = NULL,
108 .size = 0,
109 .sname = "ASN1_ENUMERATED", 99 .sname = "ASN1_ENUMERATED",
110}; 100};
111 101
@@ -138,10 +128,6 @@ ASN1_ENUMERATED_free(ASN1_ENUMERATED *a)
138const ASN1_ITEM ASN1_BIT_STRING_it = { 128const ASN1_ITEM ASN1_BIT_STRING_it = {
139 .itype = ASN1_ITYPE_PRIMITIVE, 129 .itype = ASN1_ITYPE_PRIMITIVE,
140 .utype = V_ASN1_BIT_STRING, 130 .utype = V_ASN1_BIT_STRING,
141 .templates = NULL,
142 .tcount = 0,
143 .funcs = NULL,
144 .size = 0,
145 .sname = "ASN1_BIT_STRING", 131 .sname = "ASN1_BIT_STRING",
146}; 132};
147 133
@@ -174,10 +160,6 @@ ASN1_BIT_STRING_free(ASN1_BIT_STRING *a)
174const ASN1_ITEM ASN1_OCTET_STRING_it = { 160const ASN1_ITEM ASN1_OCTET_STRING_it = {
175 .itype = ASN1_ITYPE_PRIMITIVE, 161 .itype = ASN1_ITYPE_PRIMITIVE,
176 .utype = V_ASN1_OCTET_STRING, 162 .utype = V_ASN1_OCTET_STRING,
177 .templates = NULL,
178 .tcount = 0,
179 .funcs = NULL,
180 .size = 0,
181 .sname = "ASN1_OCTET_STRING", 163 .sname = "ASN1_OCTET_STRING",
182}; 164};
183 165
@@ -210,10 +192,6 @@ ASN1_OCTET_STRING_free(ASN1_OCTET_STRING *a)
210const ASN1_ITEM ASN1_NULL_it = { 192const ASN1_ITEM ASN1_NULL_it = {
211 .itype = ASN1_ITYPE_PRIMITIVE, 193 .itype = ASN1_ITYPE_PRIMITIVE,
212 .utype = V_ASN1_NULL, 194 .utype = V_ASN1_NULL,
213 .templates = NULL,
214 .tcount = 0,
215 .funcs = NULL,
216 .size = 0,
217 .sname = "ASN1_NULL", 195 .sname = "ASN1_NULL",
218}; 196};
219 197
@@ -246,10 +224,6 @@ ASN1_NULL_free(ASN1_NULL *a)
246const ASN1_ITEM ASN1_OBJECT_it = { 224const ASN1_ITEM ASN1_OBJECT_it = {
247 .itype = ASN1_ITYPE_PRIMITIVE, 225 .itype = ASN1_ITYPE_PRIMITIVE,
248 .utype = V_ASN1_OBJECT, 226 .utype = V_ASN1_OBJECT,
249 .templates = NULL,
250 .tcount = 0,
251 .funcs = NULL,
252 .size = 0,
253 .sname = "ASN1_OBJECT", 227 .sname = "ASN1_OBJECT",
254}; 228};
255 229
@@ -257,10 +231,6 @@ const ASN1_ITEM ASN1_OBJECT_it = {
257const ASN1_ITEM ASN1_UTF8STRING_it = { 231const ASN1_ITEM ASN1_UTF8STRING_it = {
258 .itype = ASN1_ITYPE_PRIMITIVE, 232 .itype = ASN1_ITYPE_PRIMITIVE,
259 .utype = V_ASN1_UTF8STRING, 233 .utype = V_ASN1_UTF8STRING,
260 .templates = NULL,
261 .tcount = 0,
262 .funcs = NULL,
263 .size = 0,
264 .sname = "ASN1_UTF8STRING", 234 .sname = "ASN1_UTF8STRING",
265}; 235};
266 236
@@ -293,15 +263,12 @@ ASN1_UTF8STRING_free(ASN1_UTF8STRING *a)
293const ASN1_ITEM ASN1_PRINTABLESTRING_it = { 263const ASN1_ITEM ASN1_PRINTABLESTRING_it = {
294 .itype = ASN1_ITYPE_PRIMITIVE, 264 .itype = ASN1_ITYPE_PRIMITIVE,
295 .utype = V_ASN1_PRINTABLESTRING, 265 .utype = V_ASN1_PRINTABLESTRING,
296 .templates = NULL,
297 .tcount = 0,
298 .funcs = NULL,
299 .size = 0,
300 .sname = "ASN1_PRINTABLESTRING", 266 .sname = "ASN1_PRINTABLESTRING",
301}; 267};
302 268
303ASN1_PRINTABLESTRING * 269ASN1_PRINTABLESTRING *
304d2i_ASN1_PRINTABLESTRING(ASN1_PRINTABLESTRING **a, const unsigned char **in, long len) 270d2i_ASN1_PRINTABLESTRING(ASN1_PRINTABLESTRING **a, const unsigned char **in,
271 long len)
305{ 272{
306 return (ASN1_PRINTABLESTRING *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 273 return (ASN1_PRINTABLESTRING *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
307 &ASN1_PRINTABLESTRING_it); 274 &ASN1_PRINTABLESTRING_it);
@@ -329,10 +296,6 @@ ASN1_PRINTABLESTRING_free(ASN1_PRINTABLESTRING *a)
329const ASN1_ITEM ASN1_T61STRING_it = { 296const ASN1_ITEM ASN1_T61STRING_it = {
330 .itype = ASN1_ITYPE_PRIMITIVE, 297 .itype = ASN1_ITYPE_PRIMITIVE,
331 .utype = V_ASN1_T61STRING, 298 .utype = V_ASN1_T61STRING,
332 .templates = NULL,
333 .tcount = 0,
334 .funcs = NULL,
335 .size = 0,
336 .sname = "ASN1_T61STRING", 299 .sname = "ASN1_T61STRING",
337}; 300};
338 301
@@ -365,10 +328,6 @@ ASN1_T61STRING_free(ASN1_T61STRING *a)
365const ASN1_ITEM ASN1_IA5STRING_it = { 328const ASN1_ITEM ASN1_IA5STRING_it = {
366 .itype = ASN1_ITYPE_PRIMITIVE, 329 .itype = ASN1_ITYPE_PRIMITIVE,
367 .utype = V_ASN1_IA5STRING, 330 .utype = V_ASN1_IA5STRING,
368 .templates = NULL,
369 .tcount = 0,
370 .funcs = NULL,
371 .size = 0,
372 .sname = "ASN1_IA5STRING", 331 .sname = "ASN1_IA5STRING",
373}; 332};
374 333
@@ -401,15 +360,12 @@ ASN1_IA5STRING_free(ASN1_IA5STRING *a)
401const ASN1_ITEM ASN1_GENERALSTRING_it = { 360const ASN1_ITEM ASN1_GENERALSTRING_it = {
402 .itype = ASN1_ITYPE_PRIMITIVE, 361 .itype = ASN1_ITYPE_PRIMITIVE,
403 .utype = V_ASN1_GENERALSTRING, 362 .utype = V_ASN1_GENERALSTRING,
404 .templates = NULL,
405 .tcount = 0,
406 .funcs = NULL,
407 .size = 0,
408 .sname = "ASN1_GENERALSTRING", 363 .sname = "ASN1_GENERALSTRING",
409}; 364};
410 365
411ASN1_GENERALSTRING * 366ASN1_GENERALSTRING *
412d2i_ASN1_GENERALSTRING(ASN1_GENERALSTRING **a, const unsigned char **in, long len) 367d2i_ASN1_GENERALSTRING(ASN1_GENERALSTRING **a, const unsigned char **in,
368 long len)
413{ 369{
414 return (ASN1_GENERALSTRING *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 370 return (ASN1_GENERALSTRING *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
415 &ASN1_GENERALSTRING_it); 371 &ASN1_GENERALSTRING_it);
@@ -437,10 +393,6 @@ ASN1_GENERALSTRING_free(ASN1_GENERALSTRING *a)
437const ASN1_ITEM ASN1_UTCTIME_it = { 393const ASN1_ITEM ASN1_UTCTIME_it = {
438 .itype = ASN1_ITYPE_PRIMITIVE, 394 .itype = ASN1_ITYPE_PRIMITIVE,
439 .utype = V_ASN1_UTCTIME, 395 .utype = V_ASN1_UTCTIME,
440 .templates = NULL,
441 .tcount = 0,
442 .funcs = NULL,
443 .size = 0,
444 .sname = "ASN1_UTCTIME", 396 .sname = "ASN1_UTCTIME",
445}; 397};
446 398
@@ -473,15 +425,12 @@ ASN1_UTCTIME_free(ASN1_UTCTIME *a)
473const ASN1_ITEM ASN1_GENERALIZEDTIME_it = { 425const ASN1_ITEM ASN1_GENERALIZEDTIME_it = {
474 .itype = ASN1_ITYPE_PRIMITIVE, 426 .itype = ASN1_ITYPE_PRIMITIVE,
475 .utype = V_ASN1_GENERALIZEDTIME, 427 .utype = V_ASN1_GENERALIZEDTIME,
476 .templates = NULL,
477 .tcount = 0,
478 .funcs = NULL,
479 .size = 0,
480 .sname = "ASN1_GENERALIZEDTIME", 428 .sname = "ASN1_GENERALIZEDTIME",
481}; 429};
482 430
483ASN1_GENERALIZEDTIME * 431ASN1_GENERALIZEDTIME *
484d2i_ASN1_GENERALIZEDTIME(ASN1_GENERALIZEDTIME **a, const unsigned char **in, long len) 432d2i_ASN1_GENERALIZEDTIME(ASN1_GENERALIZEDTIME **a, const unsigned char **in,
433 long len)
485{ 434{
486 return (ASN1_GENERALIZEDTIME *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 435 return (ASN1_GENERALIZEDTIME *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
487 &ASN1_GENERALIZEDTIME_it); 436 &ASN1_GENERALIZEDTIME_it);
@@ -509,15 +458,12 @@ ASN1_GENERALIZEDTIME_free(ASN1_GENERALIZEDTIME *a)
509const ASN1_ITEM ASN1_VISIBLESTRING_it = { 458const ASN1_ITEM ASN1_VISIBLESTRING_it = {
510 .itype = ASN1_ITYPE_PRIMITIVE, 459 .itype = ASN1_ITYPE_PRIMITIVE,
511 .utype = V_ASN1_VISIBLESTRING, 460 .utype = V_ASN1_VISIBLESTRING,
512 .templates = NULL,
513 .tcount = 0,
514 .funcs = NULL,
515 .size = 0,
516 .sname = "ASN1_VISIBLESTRING", 461 .sname = "ASN1_VISIBLESTRING",
517}; 462};
518 463
519ASN1_VISIBLESTRING * 464ASN1_VISIBLESTRING *
520d2i_ASN1_VISIBLESTRING(ASN1_VISIBLESTRING **a, const unsigned char **in, long len) 465d2i_ASN1_VISIBLESTRING(ASN1_VISIBLESTRING **a, const unsigned char **in,
466 long len)
521{ 467{
522 return (ASN1_VISIBLESTRING *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 468 return (ASN1_VISIBLESTRING *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
523 &ASN1_VISIBLESTRING_it); 469 &ASN1_VISIBLESTRING_it);
@@ -545,15 +491,12 @@ ASN1_VISIBLESTRING_free(ASN1_VISIBLESTRING *a)
545const ASN1_ITEM ASN1_UNIVERSALSTRING_it = { 491const ASN1_ITEM ASN1_UNIVERSALSTRING_it = {
546 .itype = ASN1_ITYPE_PRIMITIVE, 492 .itype = ASN1_ITYPE_PRIMITIVE,
547 .utype = V_ASN1_UNIVERSALSTRING, 493 .utype = V_ASN1_UNIVERSALSTRING,
548 .templates = NULL,
549 .tcount = 0,
550 .funcs = NULL,
551 .size = 0,
552 .sname = "ASN1_UNIVERSALSTRING", 494 .sname = "ASN1_UNIVERSALSTRING",
553}; 495};
554 496
555ASN1_UNIVERSALSTRING * 497ASN1_UNIVERSALSTRING *
556d2i_ASN1_UNIVERSALSTRING(ASN1_UNIVERSALSTRING **a, const unsigned char **in, long len) 498d2i_ASN1_UNIVERSALSTRING(ASN1_UNIVERSALSTRING **a, const unsigned char **in,
499 long len)
557{ 500{
558 return (ASN1_UNIVERSALSTRING *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 501 return (ASN1_UNIVERSALSTRING *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
559 &ASN1_UNIVERSALSTRING_it); 502 &ASN1_UNIVERSALSTRING_it);
@@ -581,10 +524,6 @@ ASN1_UNIVERSALSTRING_free(ASN1_UNIVERSALSTRING *a)
581const ASN1_ITEM ASN1_BMPSTRING_it = { 524const ASN1_ITEM ASN1_BMPSTRING_it = {
582 .itype = ASN1_ITYPE_PRIMITIVE, 525 .itype = ASN1_ITYPE_PRIMITIVE,
583 .utype = V_ASN1_BMPSTRING, 526 .utype = V_ASN1_BMPSTRING,
584 .templates = NULL,
585 .tcount = 0,
586 .funcs = NULL,
587 .size = 0,
588 .sname = "ASN1_BMPSTRING", 527 .sname = "ASN1_BMPSTRING",
589}; 528};
590 529
@@ -617,10 +556,6 @@ ASN1_BMPSTRING_free(ASN1_BMPSTRING *a)
617const ASN1_ITEM ASN1_ANY_it = { 556const ASN1_ITEM ASN1_ANY_it = {
618 .itype = ASN1_ITYPE_PRIMITIVE, 557 .itype = ASN1_ITYPE_PRIMITIVE,
619 .utype = V_ASN1_ANY, 558 .utype = V_ASN1_ANY,
620 .templates = NULL,
621 .tcount = 0,
622 .funcs = NULL,
623 .size = 0,
624 .sname = "ASN1_ANY", 559 .sname = "ASN1_ANY",
625}; 560};
626 561
@@ -629,10 +564,6 @@ const ASN1_ITEM ASN1_ANY_it = {
629const ASN1_ITEM ASN1_SEQUENCE_it = { 564const ASN1_ITEM ASN1_SEQUENCE_it = {
630 .itype = ASN1_ITYPE_PRIMITIVE, 565 .itype = ASN1_ITYPE_PRIMITIVE,
631 .utype = V_ASN1_SEQUENCE, 566 .utype = V_ASN1_SEQUENCE,
632 .templates = NULL,
633 .tcount = 0,
634 .funcs = NULL,
635 .size = 0,
636 .sname = "ASN1_SEQUENCE", 567 .sname = "ASN1_SEQUENCE",
637}; 568};
638 569
@@ -750,9 +681,6 @@ DIRECTORYSTRING_free(ASN1_STRING *a)
750const ASN1_ITEM ASN1_BOOLEAN_it = { 681const ASN1_ITEM ASN1_BOOLEAN_it = {
751 .itype = ASN1_ITYPE_PRIMITIVE, 682 .itype = ASN1_ITYPE_PRIMITIVE,
752 .utype = V_ASN1_BOOLEAN, 683 .utype = V_ASN1_BOOLEAN,
753 .templates = NULL,
754 .tcount = 0,
755 .funcs = NULL,
756 .size = -1, 684 .size = -1,
757 .sname = "ASN1_BOOLEAN", 685 .sname = "ASN1_BOOLEAN",
758}; 686};
@@ -760,9 +688,6 @@ const ASN1_ITEM ASN1_BOOLEAN_it = {
760const ASN1_ITEM ASN1_TBOOLEAN_it = { 688const ASN1_ITEM ASN1_TBOOLEAN_it = {
761 .itype = ASN1_ITYPE_PRIMITIVE, 689 .itype = ASN1_ITYPE_PRIMITIVE,
762 .utype = V_ASN1_BOOLEAN, 690 .utype = V_ASN1_BOOLEAN,
763 .templates = NULL,
764 .tcount = 0,
765 .funcs = NULL,
766 .size = 1, 691 .size = 1,
767 .sname = "ASN1_TBOOLEAN", 692 .sname = "ASN1_TBOOLEAN",
768}; 693};
@@ -770,22 +695,15 @@ const ASN1_ITEM ASN1_TBOOLEAN_it = {
770const ASN1_ITEM ASN1_FBOOLEAN_it = { 695const ASN1_ITEM ASN1_FBOOLEAN_it = {
771 .itype = ASN1_ITYPE_PRIMITIVE, 696 .itype = ASN1_ITYPE_PRIMITIVE,
772 .utype = V_ASN1_BOOLEAN, 697 .utype = V_ASN1_BOOLEAN,
773 .templates = NULL,
774 .tcount = 0,
775 .funcs = NULL,
776 .size = 0, 698 .size = 0,
777 .sname = "ASN1_FBOOLEAN", 699 .sname = "ASN1_FBOOLEAN",
778}; 700};
779 701
780/* Special, OCTET STRING with indefinite length constructed support */ 702/* Special, OCTET STRING with indefinite length constructed support */
781 703
782
783const ASN1_ITEM ASN1_OCTET_STRING_NDEF_it = { 704const ASN1_ITEM ASN1_OCTET_STRING_NDEF_it = {
784 .itype = ASN1_ITYPE_PRIMITIVE, 705 .itype = ASN1_ITYPE_PRIMITIVE,
785 .utype = V_ASN1_OCTET_STRING, 706 .utype = V_ASN1_OCTET_STRING,
786 .templates = NULL,
787 .tcount = 0,
788 .funcs = NULL,
789 .size = ASN1_TFLG_NDEF, 707 .size = ASN1_TFLG_NDEF,
790 .sname = "ASN1_OCTET_STRING_NDEF", 708 .sname = "ASN1_OCTET_STRING_NDEF",
791}; 709};
diff --git a/src/lib/libssl/src/crypto/asn1/tasn_typ.c b/src/lib/libssl/src/crypto/asn1/tasn_typ.c
index 0e2aac1788..5b8b4f79f6 100644
--- a/src/lib/libssl/src/crypto/asn1/tasn_typ.c
+++ b/src/lib/libssl/src/crypto/asn1/tasn_typ.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tasn_typ.c,v 1.10 2015/02/10 09:39:13 jsing Exp $ */ 1/* $OpenBSD: tasn_typ.c,v 1.11 2015/02/10 09:52:16 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -61,15 +61,9 @@
61 61
62/* Declarations for string types */ 62/* Declarations for string types */
63 63
64
65
66const ASN1_ITEM ASN1_INTEGER_it = { 64const ASN1_ITEM ASN1_INTEGER_it = {
67 .itype = ASN1_ITYPE_PRIMITIVE, 65 .itype = ASN1_ITYPE_PRIMITIVE,
68 .utype = V_ASN1_INTEGER, 66 .utype = V_ASN1_INTEGER,
69 .templates = NULL,
70 .tcount = 0,
71 .funcs = NULL,
72 .size = 0,
73 .sname = "ASN1_INTEGER", 67 .sname = "ASN1_INTEGER",
74}; 68};
75 69
@@ -102,10 +96,6 @@ ASN1_INTEGER_free(ASN1_INTEGER *a)
102const ASN1_ITEM ASN1_ENUMERATED_it = { 96const ASN1_ITEM ASN1_ENUMERATED_it = {
103 .itype = ASN1_ITYPE_PRIMITIVE, 97 .itype = ASN1_ITYPE_PRIMITIVE,
104 .utype = V_ASN1_ENUMERATED, 98 .utype = V_ASN1_ENUMERATED,
105 .templates = NULL,
106 .tcount = 0,
107 .funcs = NULL,
108 .size = 0,
109 .sname = "ASN1_ENUMERATED", 99 .sname = "ASN1_ENUMERATED",
110}; 100};
111 101
@@ -138,10 +128,6 @@ ASN1_ENUMERATED_free(ASN1_ENUMERATED *a)
138const ASN1_ITEM ASN1_BIT_STRING_it = { 128const ASN1_ITEM ASN1_BIT_STRING_it = {
139 .itype = ASN1_ITYPE_PRIMITIVE, 129 .itype = ASN1_ITYPE_PRIMITIVE,
140 .utype = V_ASN1_BIT_STRING, 130 .utype = V_ASN1_BIT_STRING,
141 .templates = NULL,
142 .tcount = 0,
143 .funcs = NULL,
144 .size = 0,
145 .sname = "ASN1_BIT_STRING", 131 .sname = "ASN1_BIT_STRING",
146}; 132};
147 133
@@ -174,10 +160,6 @@ ASN1_BIT_STRING_free(ASN1_BIT_STRING *a)
174const ASN1_ITEM ASN1_OCTET_STRING_it = { 160const ASN1_ITEM ASN1_OCTET_STRING_it = {
175 .itype = ASN1_ITYPE_PRIMITIVE, 161 .itype = ASN1_ITYPE_PRIMITIVE,
176 .utype = V_ASN1_OCTET_STRING, 162 .utype = V_ASN1_OCTET_STRING,
177 .templates = NULL,
178 .tcount = 0,
179 .funcs = NULL,
180 .size = 0,
181 .sname = "ASN1_OCTET_STRING", 163 .sname = "ASN1_OCTET_STRING",
182}; 164};
183 165
@@ -210,10 +192,6 @@ ASN1_OCTET_STRING_free(ASN1_OCTET_STRING *a)
210const ASN1_ITEM ASN1_NULL_it = { 192const ASN1_ITEM ASN1_NULL_it = {
211 .itype = ASN1_ITYPE_PRIMITIVE, 193 .itype = ASN1_ITYPE_PRIMITIVE,
212 .utype = V_ASN1_NULL, 194 .utype = V_ASN1_NULL,
213 .templates = NULL,
214 .tcount = 0,
215 .funcs = NULL,
216 .size = 0,
217 .sname = "ASN1_NULL", 195 .sname = "ASN1_NULL",
218}; 196};
219 197
@@ -246,10 +224,6 @@ ASN1_NULL_free(ASN1_NULL *a)
246const ASN1_ITEM ASN1_OBJECT_it = { 224const ASN1_ITEM ASN1_OBJECT_it = {
247 .itype = ASN1_ITYPE_PRIMITIVE, 225 .itype = ASN1_ITYPE_PRIMITIVE,
248 .utype = V_ASN1_OBJECT, 226 .utype = V_ASN1_OBJECT,
249 .templates = NULL,
250 .tcount = 0,
251 .funcs = NULL,
252 .size = 0,
253 .sname = "ASN1_OBJECT", 227 .sname = "ASN1_OBJECT",
254}; 228};
255 229
@@ -257,10 +231,6 @@ const ASN1_ITEM ASN1_OBJECT_it = {
257const ASN1_ITEM ASN1_UTF8STRING_it = { 231const ASN1_ITEM ASN1_UTF8STRING_it = {
258 .itype = ASN1_ITYPE_PRIMITIVE, 232 .itype = ASN1_ITYPE_PRIMITIVE,
259 .utype = V_ASN1_UTF8STRING, 233 .utype = V_ASN1_UTF8STRING,
260 .templates = NULL,
261 .tcount = 0,
262 .funcs = NULL,
263 .size = 0,
264 .sname = "ASN1_UTF8STRING", 234 .sname = "ASN1_UTF8STRING",
265}; 235};
266 236
@@ -293,15 +263,12 @@ ASN1_UTF8STRING_free(ASN1_UTF8STRING *a)
293const ASN1_ITEM ASN1_PRINTABLESTRING_it = { 263const ASN1_ITEM ASN1_PRINTABLESTRING_it = {
294 .itype = ASN1_ITYPE_PRIMITIVE, 264 .itype = ASN1_ITYPE_PRIMITIVE,
295 .utype = V_ASN1_PRINTABLESTRING, 265 .utype = V_ASN1_PRINTABLESTRING,
296 .templates = NULL,
297 .tcount = 0,
298 .funcs = NULL,
299 .size = 0,
300 .sname = "ASN1_PRINTABLESTRING", 266 .sname = "ASN1_PRINTABLESTRING",
301}; 267};
302 268
303ASN1_PRINTABLESTRING * 269ASN1_PRINTABLESTRING *
304d2i_ASN1_PRINTABLESTRING(ASN1_PRINTABLESTRING **a, const unsigned char **in, long len) 270d2i_ASN1_PRINTABLESTRING(ASN1_PRINTABLESTRING **a, const unsigned char **in,
271 long len)
305{ 272{
306 return (ASN1_PRINTABLESTRING *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 273 return (ASN1_PRINTABLESTRING *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
307 &ASN1_PRINTABLESTRING_it); 274 &ASN1_PRINTABLESTRING_it);
@@ -329,10 +296,6 @@ ASN1_PRINTABLESTRING_free(ASN1_PRINTABLESTRING *a)
329const ASN1_ITEM ASN1_T61STRING_it = { 296const ASN1_ITEM ASN1_T61STRING_it = {
330 .itype = ASN1_ITYPE_PRIMITIVE, 297 .itype = ASN1_ITYPE_PRIMITIVE,
331 .utype = V_ASN1_T61STRING, 298 .utype = V_ASN1_T61STRING,
332 .templates = NULL,
333 .tcount = 0,
334 .funcs = NULL,
335 .size = 0,
336 .sname = "ASN1_T61STRING", 299 .sname = "ASN1_T61STRING",
337}; 300};
338 301
@@ -365,10 +328,6 @@ ASN1_T61STRING_free(ASN1_T61STRING *a)
365const ASN1_ITEM ASN1_IA5STRING_it = { 328const ASN1_ITEM ASN1_IA5STRING_it = {
366 .itype = ASN1_ITYPE_PRIMITIVE, 329 .itype = ASN1_ITYPE_PRIMITIVE,
367 .utype = V_ASN1_IA5STRING, 330 .utype = V_ASN1_IA5STRING,
368 .templates = NULL,
369 .tcount = 0,
370 .funcs = NULL,
371 .size = 0,
372 .sname = "ASN1_IA5STRING", 331 .sname = "ASN1_IA5STRING",
373}; 332};
374 333
@@ -401,15 +360,12 @@ ASN1_IA5STRING_free(ASN1_IA5STRING *a)
401const ASN1_ITEM ASN1_GENERALSTRING_it = { 360const ASN1_ITEM ASN1_GENERALSTRING_it = {
402 .itype = ASN1_ITYPE_PRIMITIVE, 361 .itype = ASN1_ITYPE_PRIMITIVE,
403 .utype = V_ASN1_GENERALSTRING, 362 .utype = V_ASN1_GENERALSTRING,
404 .templates = NULL,
405 .tcount = 0,
406 .funcs = NULL,
407 .size = 0,
408 .sname = "ASN1_GENERALSTRING", 363 .sname = "ASN1_GENERALSTRING",
409}; 364};
410 365
411ASN1_GENERALSTRING * 366ASN1_GENERALSTRING *
412d2i_ASN1_GENERALSTRING(ASN1_GENERALSTRING **a, const unsigned char **in, long len) 367d2i_ASN1_GENERALSTRING(ASN1_GENERALSTRING **a, const unsigned char **in,
368 long len)
413{ 369{
414 return (ASN1_GENERALSTRING *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 370 return (ASN1_GENERALSTRING *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
415 &ASN1_GENERALSTRING_it); 371 &ASN1_GENERALSTRING_it);
@@ -437,10 +393,6 @@ ASN1_GENERALSTRING_free(ASN1_GENERALSTRING *a)
437const ASN1_ITEM ASN1_UTCTIME_it = { 393const ASN1_ITEM ASN1_UTCTIME_it = {
438 .itype = ASN1_ITYPE_PRIMITIVE, 394 .itype = ASN1_ITYPE_PRIMITIVE,
439 .utype = V_ASN1_UTCTIME, 395 .utype = V_ASN1_UTCTIME,
440 .templates = NULL,
441 .tcount = 0,
442 .funcs = NULL,
443 .size = 0,
444 .sname = "ASN1_UTCTIME", 396 .sname = "ASN1_UTCTIME",
445}; 397};
446 398
@@ -473,15 +425,12 @@ ASN1_UTCTIME_free(ASN1_UTCTIME *a)
473const ASN1_ITEM ASN1_GENERALIZEDTIME_it = { 425const ASN1_ITEM ASN1_GENERALIZEDTIME_it = {
474 .itype = ASN1_ITYPE_PRIMITIVE, 426 .itype = ASN1_ITYPE_PRIMITIVE,
475 .utype = V_ASN1_GENERALIZEDTIME, 427 .utype = V_ASN1_GENERALIZEDTIME,
476 .templates = NULL,
477 .tcount = 0,
478 .funcs = NULL,
479 .size = 0,
480 .sname = "ASN1_GENERALIZEDTIME", 428 .sname = "ASN1_GENERALIZEDTIME",
481}; 429};
482 430
483ASN1_GENERALIZEDTIME * 431ASN1_GENERALIZEDTIME *
484d2i_ASN1_GENERALIZEDTIME(ASN1_GENERALIZEDTIME **a, const unsigned char **in, long len) 432d2i_ASN1_GENERALIZEDTIME(ASN1_GENERALIZEDTIME **a, const unsigned char **in,
433 long len)
485{ 434{
486 return (ASN1_GENERALIZEDTIME *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 435 return (ASN1_GENERALIZEDTIME *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
487 &ASN1_GENERALIZEDTIME_it); 436 &ASN1_GENERALIZEDTIME_it);
@@ -509,15 +458,12 @@ ASN1_GENERALIZEDTIME_free(ASN1_GENERALIZEDTIME *a)
509const ASN1_ITEM ASN1_VISIBLESTRING_it = { 458const ASN1_ITEM ASN1_VISIBLESTRING_it = {
510 .itype = ASN1_ITYPE_PRIMITIVE, 459 .itype = ASN1_ITYPE_PRIMITIVE,
511 .utype = V_ASN1_VISIBLESTRING, 460 .utype = V_ASN1_VISIBLESTRING,
512 .templates = NULL,
513 .tcount = 0,
514 .funcs = NULL,
515 .size = 0,
516 .sname = "ASN1_VISIBLESTRING", 461 .sname = "ASN1_VISIBLESTRING",
517}; 462};
518 463
519ASN1_VISIBLESTRING * 464ASN1_VISIBLESTRING *
520d2i_ASN1_VISIBLESTRING(ASN1_VISIBLESTRING **a, const unsigned char **in, long len) 465d2i_ASN1_VISIBLESTRING(ASN1_VISIBLESTRING **a, const unsigned char **in,
466 long len)
521{ 467{
522 return (ASN1_VISIBLESTRING *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 468 return (ASN1_VISIBLESTRING *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
523 &ASN1_VISIBLESTRING_it); 469 &ASN1_VISIBLESTRING_it);
@@ -545,15 +491,12 @@ ASN1_VISIBLESTRING_free(ASN1_VISIBLESTRING *a)
545const ASN1_ITEM ASN1_UNIVERSALSTRING_it = { 491const ASN1_ITEM ASN1_UNIVERSALSTRING_it = {
546 .itype = ASN1_ITYPE_PRIMITIVE, 492 .itype = ASN1_ITYPE_PRIMITIVE,
547 .utype = V_ASN1_UNIVERSALSTRING, 493 .utype = V_ASN1_UNIVERSALSTRING,
548 .templates = NULL,
549 .tcount = 0,
550 .funcs = NULL,
551 .size = 0,
552 .sname = "ASN1_UNIVERSALSTRING", 494 .sname = "ASN1_UNIVERSALSTRING",
553}; 495};
554 496
555ASN1_UNIVERSALSTRING * 497ASN1_UNIVERSALSTRING *
556d2i_ASN1_UNIVERSALSTRING(ASN1_UNIVERSALSTRING **a, const unsigned char **in, long len) 498d2i_ASN1_UNIVERSALSTRING(ASN1_UNIVERSALSTRING **a, const unsigned char **in,
499 long len)
557{ 500{
558 return (ASN1_UNIVERSALSTRING *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 501 return (ASN1_UNIVERSALSTRING *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
559 &ASN1_UNIVERSALSTRING_it); 502 &ASN1_UNIVERSALSTRING_it);
@@ -581,10 +524,6 @@ ASN1_UNIVERSALSTRING_free(ASN1_UNIVERSALSTRING *a)
581const ASN1_ITEM ASN1_BMPSTRING_it = { 524const ASN1_ITEM ASN1_BMPSTRING_it = {
582 .itype = ASN1_ITYPE_PRIMITIVE, 525 .itype = ASN1_ITYPE_PRIMITIVE,
583 .utype = V_ASN1_BMPSTRING, 526 .utype = V_ASN1_BMPSTRING,
584 .templates = NULL,
585 .tcount = 0,
586 .funcs = NULL,
587 .size = 0,
588 .sname = "ASN1_BMPSTRING", 527 .sname = "ASN1_BMPSTRING",
589}; 528};
590 529
@@ -617,10 +556,6 @@ ASN1_BMPSTRING_free(ASN1_BMPSTRING *a)
617const ASN1_ITEM ASN1_ANY_it = { 556const ASN1_ITEM ASN1_ANY_it = {
618 .itype = ASN1_ITYPE_PRIMITIVE, 557 .itype = ASN1_ITYPE_PRIMITIVE,
619 .utype = V_ASN1_ANY, 558 .utype = V_ASN1_ANY,
620 .templates = NULL,
621 .tcount = 0,
622 .funcs = NULL,
623 .size = 0,
624 .sname = "ASN1_ANY", 559 .sname = "ASN1_ANY",
625}; 560};
626 561
@@ -629,10 +564,6 @@ const ASN1_ITEM ASN1_ANY_it = {
629const ASN1_ITEM ASN1_SEQUENCE_it = { 564const ASN1_ITEM ASN1_SEQUENCE_it = {
630 .itype = ASN1_ITYPE_PRIMITIVE, 565 .itype = ASN1_ITYPE_PRIMITIVE,
631 .utype = V_ASN1_SEQUENCE, 566 .utype = V_ASN1_SEQUENCE,
632 .templates = NULL,
633 .tcount = 0,
634 .funcs = NULL,
635 .size = 0,
636 .sname = "ASN1_SEQUENCE", 567 .sname = "ASN1_SEQUENCE",
637}; 568};
638 569
@@ -750,9 +681,6 @@ DIRECTORYSTRING_free(ASN1_STRING *a)
750const ASN1_ITEM ASN1_BOOLEAN_it = { 681const ASN1_ITEM ASN1_BOOLEAN_it = {
751 .itype = ASN1_ITYPE_PRIMITIVE, 682 .itype = ASN1_ITYPE_PRIMITIVE,
752 .utype = V_ASN1_BOOLEAN, 683 .utype = V_ASN1_BOOLEAN,
753 .templates = NULL,
754 .tcount = 0,
755 .funcs = NULL,
756 .size = -1, 684 .size = -1,
757 .sname = "ASN1_BOOLEAN", 685 .sname = "ASN1_BOOLEAN",
758}; 686};
@@ -760,9 +688,6 @@ const ASN1_ITEM ASN1_BOOLEAN_it = {
760const ASN1_ITEM ASN1_TBOOLEAN_it = { 688const ASN1_ITEM ASN1_TBOOLEAN_it = {
761 .itype = ASN1_ITYPE_PRIMITIVE, 689 .itype = ASN1_ITYPE_PRIMITIVE,
762 .utype = V_ASN1_BOOLEAN, 690 .utype = V_ASN1_BOOLEAN,
763 .templates = NULL,
764 .tcount = 0,
765 .funcs = NULL,
766 .size = 1, 691 .size = 1,
767 .sname = "ASN1_TBOOLEAN", 692 .sname = "ASN1_TBOOLEAN",
768}; 693};
@@ -770,22 +695,15 @@ const ASN1_ITEM ASN1_TBOOLEAN_it = {
770const ASN1_ITEM ASN1_FBOOLEAN_it = { 695const ASN1_ITEM ASN1_FBOOLEAN_it = {
771 .itype = ASN1_ITYPE_PRIMITIVE, 696 .itype = ASN1_ITYPE_PRIMITIVE,
772 .utype = V_ASN1_BOOLEAN, 697 .utype = V_ASN1_BOOLEAN,
773 .templates = NULL,
774 .tcount = 0,
775 .funcs = NULL,
776 .size = 0, 698 .size = 0,
777 .sname = "ASN1_FBOOLEAN", 699 .sname = "ASN1_FBOOLEAN",
778}; 700};
779 701
780/* Special, OCTET STRING with indefinite length constructed support */ 702/* Special, OCTET STRING with indefinite length constructed support */
781 703
782
783const ASN1_ITEM ASN1_OCTET_STRING_NDEF_it = { 704const ASN1_ITEM ASN1_OCTET_STRING_NDEF_it = {
784 .itype = ASN1_ITYPE_PRIMITIVE, 705 .itype = ASN1_ITYPE_PRIMITIVE,
785 .utype = V_ASN1_OCTET_STRING, 706 .utype = V_ASN1_OCTET_STRING,
786 .templates = NULL,
787 .tcount = 0,
788 .funcs = NULL,
789 .size = ASN1_TFLG_NDEF, 707 .size = ASN1_TFLG_NDEF,
790 .sname = "ASN1_OCTET_STRING_NDEF", 708 .sname = "ASN1_OCTET_STRING_NDEF",
791}; 709};
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-20 09:48:28 +0000