ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Convert-BER-XS/XS.xs
(Generate patch)

Comparing Convert-BER-XS/XS.xs (file contents):
Revision 1.10 by root, Sat Apr 20 11:12:47 2019 UTC vs.
Revision 1.15 by root, Sat Apr 20 15:23:26 2019 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5// C99 required 5// C99 required!
6// this is not just for comments, but also for
7// integer constant semantics,
8// sscanf format modifiers and more.
6 9
7enum { 10enum {
8 // ASN_TAG 11 // ASN_TAG
9 ASN_BOOLEAN = 0x01, 12 ASN_BOOLEAN = 0x01,
10 ASN_INTEGER32 = 0x02, 13 ASN_INTEGER = 0x02,
11 ASN_BIT_STRING = 0x03, 14 ASN_BIT_STRING = 0x03,
12 ASN_OCTET_STRING = 0x04, 15 ASN_OCTET_STRING = 0x04,
13 ASN_NULL = 0x05, 16 ASN_NULL = 0x05,
14 ASN_OBJECT_IDENTIFIER = 0x06, 17 ASN_OBJECT_IDENTIFIER = 0x06,
15 ASN_OID = 0x06, 18 ASN_OID = 0x06,
… …
178 181
179 SvPVX (sv)[idx] = type; 182 SvPVX (sv)[idx] = type;
180} 183}
181 184
182static SV * 185static SV *
183profile_new () 186profile_new (void)
184{ 187{
185 SV *sv = newSVpvn ("", 0); 188 SV *sv = newSVpvn ("", 0);
186 189
187 static const struct { 190 static const struct {
188 int klass; 191 int klass;
189 int tag; 192 int tag;
190 int type; 193 int type;
191 } *celem, default_map[] = { 194 } *celem, default_map[] = {
192 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL }, 195 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },
193 { ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT }, 196 { ASN_UNIVERSAL, ASN_INTEGER , BER_TYPE_INT },
194 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL }, 197 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },
195 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID }, 198 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID },
196 { ASN_UNIVERSAL, ASN_OBJECT_DESCRIPTOR, BER_TYPE_OID },
197 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID }, 199 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
198 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL }, 200 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
201 { ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
199 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 }, 202 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },
200 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 }, 203 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },
201 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 }, 204 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },
202 }; 205 };
203 206
204 for (celem = default_map + sizeof (default_map) / sizeof (default_map [0]); celem > default_map; celem--) 207 for (celem = default_map + sizeof (default_map) / sizeof (default_map [0]); celem-- > default_map; )
205 profile_set ((void *)sv, celem->klass, celem->tag, celem->type); 208 profile_set ((profile_type *)sv, celem->klass, celem->tag, celem->type);
206 209
207 return sv_bless (newRV_noinc (sv), profile_stash); 210 return sv_bless (newRV_noinc (sv), profile_stash);
208} 211}
209 212
210///////////////////////////////////////////////////////////////////////////// 213/////////////////////////////////////////////////////////////////////////////
… …
245 248
246 return *cur++; 249 return *cur++;
247} 250}
248 251
249// get ber-encoded integer (i.e. pack "w") 252// get ber-encoded integer (i.e. pack "w")
250static U32 253static UV
251get_w (void) 254get_w (void)
252{ 255{
253 U32 res = 0; 256 UV res = 0;
254 257
255 for (;;) 258 for (;;)
256 { 259 {
257 U8 c = get_u8 (); 260 U8 c = get_u8 ();
258 res = (res << 7) | (c & 0x7f); 261 res = (res << 7) | (c & 0x7f);
… …
260 if (!(c & 0x80)) 263 if (!(c & 0x80))
261 return res; 264 return res;
262 } 265 }
263} 266}
264 267
265static U32 268static UV
266get_length (void) 269get_length (void)
267{ 270{
268 U32 res = get_u8 (); 271 UV res = get_u8 ();
269 272
270 if (res & 0x80) 273 if (res & 0x80)
271 { 274 {
272 int cnt = res & 0x7f; 275 int cnt = res & 0x7f;
273 res = 0; 276 res = 0;
… …
280 283
281 default: 284 default:
282 error ("ASN.1 length too long"); 285 error ("ASN.1 length too long");
283 return 0; 286 return 0;
284 287
288 case 8: res = (res << 8) | get_u8 ();
289 case 7: res = (res << 8) | get_u8 ();
290 case 6: res = (res << 8) | get_u8 ();
291 case 5: res = (res << 8) | get_u8 ();
285 case 4: res = (res << 8) | get_u8 (); 292 case 4: res = (res << 8) | get_u8 ();
286 case 3: res = (res << 8) | get_u8 (); 293 case 3: res = (res << 8) | get_u8 ();
287 case 2: res = (res << 8) | get_u8 (); 294 case 2: res = (res << 8) | get_u8 ();
288 case 1: res = (res << 8) | get_u8 (); 295 case 1: res = (res << 8) | get_u8 ();
289 } 296 }
… …
291 298
292 return res; 299 return res;
293} 300}
294 301
295static SV * 302static SV *
296decode_int () 303decode_int (void)
297{ 304{
298 int len = get_length (); 305 UV len = get_length ();
299 306
300 if (len <= 0) 307 if (!len)
301 { 308 {
302 error ("integer length equal to zero"); 309 error ("invalid integer length equal to zero");
303 return 0; 310 return 0;
304 } 311 }
305 312
306 U8 *data = get_n (len); 313 U8 *data = get_n (len);
307 314
… …
319} 326}
320 327
321static SV * 328static SV *
322decode_data (void) 329decode_data (void)
323{ 330{
324 U32 len = get_length (); 331 UV len = get_length ();
325 U8 *data = get_n (len);
326 return newSVpvn ((char *)data, len); 332 return newSVpvn ((char *)get_n (len), len);
327} 333}
328 334
329// gelper for decode_object_identifier 335// helper for decode_object_identifier
330static char * 336static char *
331write_uv (char *buf, U32 u) 337write_uv (char *buf, UV u)
332{ 338{
333 // the one-digit case is absolutely predominant, so this pays off (hopefully) 339 // the one-digit case is absolutely predominant, so this pays off (hopefully)
334 if (expect_true (u < 10)) 340 if (expect_true (u < 10))
335 *buf++ = u + '0'; 341 *buf++ = u + '0';
336 else 342 else
337 { 343 {
344 // this *could* be done much faster using branchless fixed-point arithmetics
338 char *beg = buf; 345 char *beg = buf;
339 346
340 do 347 do
341 { 348 {
342 *buf++ = u % 10 + '0'; 349 *buf++ = u % 10 + '0';
343 u /= 10; 350 u /= 10;
344 } 351 }
345 while (u); 352 while (u);
346 353
347 // reverse digits 354 // reverse digits
348 for (char *ptr = buf; --ptr != beg; ++beg) 355 char *ptr = buf;
356 while (--ptr > beg)
349 { 357 {
350 char c = *ptr; 358 char c = *ptr;
351 *ptr = *beg; 359 *ptr = *beg;
352 *beg = c; 360 *beg = c;
361 ++beg;
353 } 362 }
354 } 363 }
355 364
356 return buf; 365 return buf;
357} 366}
358 367
359static SV * 368static SV *
360decode_oid (int relative) 369decode_oid (int relative)
361{ 370{
362 U32 len = get_length (); 371 UV len = get_length ();
363 372
364 if (len <= 0) 373 if (len <= 0)
365 { 374 {
366 error ("OBJECT IDENTIFIER length equal to zero"); 375 error ("OBJECT IDENTIFIER length equal to zero");
367 return &PL_sv_undef; 376 return &PL_sv_undef;
368 } 377 }
369 378
370 U8 *end = cur + len; 379 U8 *end = cur + len;
371 U32 w = get_w (); 380 UV w = get_w ();
372 381
373 static char oid[MAX_OID_STRLEN]; // must be static 382 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack
374 char *app = oid; 383 char *app = oid;
375 384
376 if (relative) 385 if (relative)
377 app = write_uv (app, w); 386 app = write_uv (app, w);
378 else 387 else
… …
380 app = write_uv (app, (U8)w / 40); 389 app = write_uv (app, (U8)w / 40);
381 *app++ = '.'; 390 *app++ = '.';
382 app = write_uv (app, (U8)w % 40); 391 app = write_uv (app, (U8)w % 40);
383 } 392 }
384 393
394 while (cur < end)
395 {
385 // we assume an oid component is never > 64 bytes 396 // we assume an oid component is never > 64 digits
386 while (cur < end && oid + sizeof (oid) - app > 64) 397 if (oid + sizeof (oid) - app < 64)
387 { 398 croak ("BER_TYPE_OID to long to decode");
399
388 w = get_w (); 400 w = get_w ();
389 *app++ = '.'; 401 *app++ = '.';
390 app = write_uv (app, w); 402 app = write_uv (app, w);
391 } 403 }
392 404
… …
397static SV * 409static SV *
398decode_ucs (int chrsize) 410decode_ucs (int chrsize)
399{ 411{
400 SV *res = NEWSV (0, 0); 412 SV *res = NEWSV (0, 0);
401 413
402 U32 len = get_length (); 414 UV len = get_length ();
403 415
404 if (len & (chrsize - 1)) 416 if (len & (chrsize - 1))
405 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len); 417 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
406 418
407 while (len) 419 while (len)
… …
428 440
429 return res; 441 return res;
430} 442}
431 443
432static SV * 444static SV *
433decode_ber () 445decode_ber (void)
434{ 446{
435 int identifier = get_u8 (); 447 int identifier = get_u8 ();
436 448
437 SV *res; 449 SV *res;
438 450
… …
446 if (tag == ASN_TAG_BER) 458 if (tag == ASN_TAG_BER)
447 tag = get_w (); 459 tag = get_w ();
448 460
449 if (constructed) 461 if (constructed)
450 { 462 {
451 U32 len = get_length (); 463 UV len = get_length ();
452 U32 seqend = (cur - buf) + len; 464 UV seqend = (cur - buf) + len;
453 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 465 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
454 466
455 while (cur < buf + seqend) 467 while (cur < buf + seqend)
456 av_push (av, decode_ber ()); 468 av_push (av, decode_ber ());
457 469
… …
462 } 474 }
463 else 475 else
464 switch (profile_lookup (cur_profile, klass, tag)) 476 switch (profile_lookup (cur_profile, klass, tag))
465 { 477 {
466 case BER_TYPE_NULL: 478 case BER_TYPE_NULL:
479 {
480 UV len = get_length ();
481
482 if (len)
483 croak ("BER_TYPE_NULL value with non-zero length %d encountered", len);
484
467 res = &PL_sv_undef; 485 res = &PL_sv_undef;
486 }
468 break; 487 break;
469 488
470 case BER_TYPE_BOOL: 489 case BER_TYPE_BOOL:
471 { 490 {
472 U32 len = get_length (); 491 UV len = get_length ();
473 492
474 if (len != 1) 493 if (len != 1)
475 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len); 494 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len);
476 495
477 res = newSVcacheint (get_u8 () ? 0 : 1); 496 res = newSVcacheint (!!get_u8 ());
478 } 497 }
479 break; 498 break;
480 499
481 case BER_TYPE_OID: 500 case BER_TYPE_OID:
482 res = decode_oid (0); 501 res = decode_oid (0);
… …
499 res = decode_data (); 518 res = decode_data ();
500 break; 519 break;
501 520
502 case BER_TYPE_IPADDRESS: 521 case BER_TYPE_IPADDRESS:
503 { 522 {
504 U32 len = get_length (); 523 UV len = get_length ();
505 524
506 if (len != 4) 525 if (len != 4)
507 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 526 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len);
508 527
509 U8 c1 = get_u8 (); 528 U8 c1 = get_u8 ();
… …
595 need (1); 614 need (1);
596 *cur++ = val; 615 *cur++ = val;
597} 616}
598 617
599static void 618static void
600put_w_nocheck (U32 val) 619put_w_nocheck (UV val)
601{ 620{
621#if UVSIZE > 4
622 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
623 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
624 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
625 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
626 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
627#endif
602 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 628 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
603 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 629 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
604 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 630 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
605 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 631 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
606 *cur = val & 0x7f; cur += 1; 632 *cur = val & 0x7f; cur += 1;
607} 633}
608 634
609static void 635static void
610put_w (U32 val) 636put_w (UV val)
611{ 637{
612 need (5); // we only handle up to 5 bytes 638 need (5); // we only handle up to 5 bytes
613 639
614 put_w_nocheck (val); 640 put_w_nocheck (val);
615} 641}
616 642
617static U8 * 643static U8 *
618put_length_at (U32 val, U8 *cur) 644put_length_at (UV val, U8 *cur)
619{ 645{
620 if (val < 0x7fU) 646 if (val < 0x7fU)
621 *cur++ = val; 647 *cur++ = val;
622 else 648 else
623 { 649 {
624 U8 *lenb = cur++; 650 U8 *lenb = cur++;
625 651
652#if UVSIZE > 4
653 *cur = val >> 56; cur += *cur > 0;
654 *cur = val >> 48; cur += *cur > 0;
655 *cur = val >> 40; cur += *cur > 0;
656 *cur = val >> 32; cur += *cur > 0;
657#endif
626 *cur = val >> 24; cur += *cur > 0; 658 *cur = val >> 24; cur += *cur > 0;
627 *cur = val >> 16; cur += *cur > 0; 659 *cur = val >> 16; cur += *cur > 0;
628 *cur = val >> 8; cur += *cur > 0; 660 *cur = val >> 8; cur += *cur > 0;
629 *cur = val ; cur += 1; 661 *cur = val ; cur += 1;
630 662
… …
633 665
634 return cur; 666 return cur;
635} 667}
636 668
637static void 669static void
638put_length (U32 val) 670put_length (UV val)
639{ 671{
640 need (5 + val); 672 need (5 + val);
641 cur = put_length_at (val, cur); 673 cur = put_length_at (val, cur);
642} 674}
643 675
644// return how many bytes the encoded length requires 676// return how many bytes the encoded length requires
645static int length_length (U32 val) 677static int length_length (UV val)
646{ 678{
647 return val < 0x7fU 679 return val < 0x7fU
648 ? 1 680 ? 1
649 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 681 : 2
682 + (val > 0xffU)
683 + (val > 0xffffU)
684 + (val > 0xffffffU)
685#if UVSIZE > 4
686 + (val > 0xffffffffU)
687 + (val > 0xffffffffffU)
688 + (val > 0xffffffffffffU)
689 + (val > 0xffffffffffffffU)
690#endif
691 ;
650} 692}
651 693
652static void 694static void
653encode_data (const char *ptr, STRLEN len) 695encode_data (const char *ptr, STRLEN len)
654{ 696{
… …
716 758
717 *lenb = cur - lenb - 1; 759 *lenb = cur - lenb - 1;
718} 760}
719 761
720// we don't know the length yet, so we optimistically 762// we don't know the length yet, so we optimistically
721// assume the length will need one octet later. if that 763// assume the length will need one octet later. If that
722// turns out to be wrong, we memove as needed. 764// turns out to be wrong, we memmove as needed.
723// mark the beginning 765// mark the beginning
724static STRLEN 766static STRLEN
725len_fixup_mark () 767len_fixup_mark (void)
726{ 768{
727 return cur++ - buf; 769 return cur++ - buf;
728} 770}
729 771
730// patch up the length 772// patch up the length
… …
868 int fill = AvFILL (av); 910 int fill = AvFILL (av);
869 911
870 if (expect_false (SvRMAGICAL (av))) 912 if (expect_false (SvRMAGICAL (av)))
871 croak ("BER constructed data must not be tied"); 913 croak ("BER constructed data must not be tied");
872 914
915 int i;
873 for (int i = 0; i <= fill; ++i) 916 for (i = 0; i <= fill; ++i)
874 encode_ber (AvARRAY (av)[i]); 917 encode_ber (AvARRAY (av)[i]);
875 918
876 len_fixup (mark); 919 len_fixup (mark);
877 } 920 }
878 else 921 else
… …
955 const char *name; 998 const char *name;
956 IV iv; 999 IV iv;
957 } *civ, const_iv[] = { 1000 } *civ, const_iv[] = {
958#define const_iv(name) { # name, name }, 1001#define const_iv(name) { # name, name },
959 const_iv (ASN_BOOLEAN) 1002 const_iv (ASN_BOOLEAN)
960 const_iv (ASN_INTEGER32) 1003 const_iv (ASN_INTEGER)
961 const_iv (ASN_BIT_STRING) 1004 const_iv (ASN_BIT_STRING)
962 const_iv (ASN_OCTET_STRING) 1005 const_iv (ASN_OCTET_STRING)
963 const_iv (ASN_NULL) 1006 const_iv (ASN_NULL)
964 const_iv (ASN_OBJECT_IDENTIFIER) 1007 const_iv (ASN_OBJECT_IDENTIFIER)
965 const_iv (ASN_OBJECT_DESCRIPTOR) 1008 const_iv (ASN_OBJECT_DESCRIPTOR)
… …
1073 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1116 && SvIV (AvARRAY (av)[BER_CONSTRUCTED])
1074 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1117 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1075} 1118}
1076 1119
1077void 1120void
1078ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1121ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1079 PPCODE: 1122 PPCODE:
1080{ 1123{
1081 if (!SvOK (tuple)) 1124 if (!SvOK (tuple))
1082 XSRETURN_NO; 1125 XSRETURN_NO;
1083 1126
1084 AV *av = ber_tuple (tuple); 1127 AV *av = ber_tuple (tuple);
1085 1128
1086 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1129 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1087 1130
1088 XPUSHs ( 1131 XPUSHs (
1089 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1132 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL
1090 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1133 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1091 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1134 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED])
1092 && (!SvOK (value) || data == SvIV (value)) 1135 && (!SvOK (value) || data == SvUV (value))
1093 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1136 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1094 : &PL_sv_undef); 1137 : &PL_sv_undef);
1095} 1138}
1096 1139
1097void 1140void
1098ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1141ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
… …
1127 SvCUR_set (buf_sv, cur - buf); 1170 SvCUR_set (buf_sv, cur - buf);
1128 XPUSHs (buf_sv); 1171 XPUSHs (buf_sv);
1129} 1172}
1130 1173
1131SV * 1174SV *
1132ber_i32 (IV iv) 1175ber_int (SV *sv)
1133 CODE: 1176 CODE:
1134{ 1177{
1135 AV *av = newAV (); 1178 AV *av = newAV ();
1136 av_fill (av, BER_ARRAYSIZE - 1); 1179 av_fill (av, BER_ARRAYSIZE - 1);
1137 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1180 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL);
1138 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1181 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1139 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1182 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0);
1140 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1183 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1141 RETVAL = newRV_noinc ((SV *)av); 1184 RETVAL = newRV_noinc ((SV *)av);
1142} 1185}
1143 OUTPUT: RETVAL 1186 OUTPUT: RETVAL
1144 1187
1145# TODO: not arrayref, but elements? 1188# TODO: not arrayref, but elements?

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines