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.29 by root, Tue Apr 23 19:44:12 2019 UTC vs.
Revision 1.30 by root, Tue Apr 23 20:03:08 2019 UTC

… …
65 SNMP_TIMETICKS = 0x03, 65 SNMP_TIMETICKS = 0x03,
66 SNMP_OPAQUE = 0x04, 66 SNMP_OPAQUE = 0x04,
67 SNMP_COUNTER64 = 0x06, 67 SNMP_COUNTER64 = 0x06,
68}; 68};
69 69
70// tlow-level types this module can ecode the above (and more) into
70enum { 71enum {
71 BER_TYPE_BYTES, 72 BER_TYPE_BYTES,
72 BER_TYPE_UTF8, 73 BER_TYPE_UTF8,
73 BER_TYPE_UCS2, 74 BER_TYPE_UCS2,
74 BER_TYPE_UCS4, 75 BER_TYPE_UCS4,
… …
80 BER_TYPE_REAL, 81 BER_TYPE_REAL,
81 BER_TYPE_IPADDRESS, 82 BER_TYPE_IPADDRESS,
82 BER_TYPE_CROAK, 83 BER_TYPE_CROAK,
83}; 84};
84 85
86// tuple array indices
85enum { 87enum {
86 BER_CLASS = 0, 88 BER_CLASS = 0,
87 BER_TAG = 1, 89 BER_TAG = 1,
88 BER_FLAGS = 2, 90 BER_FLAGS = 2,
89 BER_DATA = 3, 91 BER_DATA = 3,
… …
303 305
304 return res; 306 return res;
305} 307}
306 308
307static SV * 309static SV *
308decode_int (void) 310decode_int (UV len)
309{ 311{
310 UV len = get_length ();
311
312 if (!len) 312 if (!len)
313 error ("invalid BER_TYPE_INT length zero (X.690 8.3.1)"); 313 error ("invalid BER_TYPE_INT length zero (X.690 8.3.1)");
314 314
315 U8 *data = get_n (len); 315 U8 *data = get_n (len);
316 316
… …
337 // but that's ok, as perl relies on it as well. 337 // but that's ok, as perl relies on it as well.
338 return negative ? newSViv ((IV)val) : newSVuv (val); 338 return negative ? newSViv ((IV)val) : newSVuv (val);
339} 339}
340 340
341static SV * 341static SV *
342decode_data (void) 342decode_data (UV len)
343{ 343{
344 UV len = get_length ();
345 return newSVpvn ((char *)get_n (len), len); 344 return newSVpvn ((char *)get_n (len), len);
346} 345}
347 346
348// helper for decode_object_identifier 347// helper for decode_object_identifier
349static char * 348static char *
… …
377 376
378 return buf; 377 return buf;
379} 378}
380 379
381static SV * 380static SV *
382decode_oid (int relative) 381decode_oid (UV len, int relative)
383{ 382{
384 UV len = get_length ();
385
386 if (len <= 0) 383 if (len <= 0)
387 { 384 {
388 error ("BER_TYPE_OID length must not be zero"); 385 error ("BER_TYPE_OID length must not be zero");
389 return &PL_sv_undef; 386 return &PL_sv_undef;
390 } 387 }
… …
425 return newSVpvn (oid, app - oid); 422 return newSVpvn (oid, app - oid);
426} 423}
427 424
428// TODO: this is unacceptably slow 425// TODO: this is unacceptably slow
429static SV * 426static SV *
430decode_ucs (int chrsize) 427decode_ucs (UV len, int chrsize)
431{ 428{
432 SV *res = NEWSV (0, 0);
433
434 UV len = get_length ();
435
436 if (len & (chrsize - 1)) 429 if (len & (chrsize - 1))
437 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len); 430 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
431
432 SV *res = NEWSV (0, 0);
438 433
439 while (len) 434 while (len)
440 { 435 {
441 U8 b1 = get_u8 (); 436 U8 b1 = get_u8 ();
442 U8 b2 = get_u8 (); 437 U8 b2 = get_u8 ();
… …
482 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 477 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
483 478
484 while (cur < buf + seqend) 479 while (cur < buf + seqend)
485 av_push (av, decode_ber ()); 480 av_push (av, decode_ber ());
486 481
487 if (cur > buf + seqend) 482 if (expect_false (cur > buf + seqend))
488 croak ("CONSTRUCTED type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend); 483 croak ("CONSTRUCTED type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
489 484
490 res = newRV_inc ((SV *)av); 485 res = newRV_inc ((SV *)av);
491 } 486 }
492 else 487 else
488 {
489 UV len = get_length ();
490
493 switch (profile_lookup (cur_profile, klass, tag)) 491 switch (profile_lookup (cur_profile, klass, tag))
494 { 492 {
495 case BER_TYPE_NULL: 493 case BER_TYPE_NULL:
496 { 494 if (expect_false (len))
497 UV len = get_length ();
498
499 if (len)
500 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len); 495 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
501 496
502 res = &PL_sv_undef; 497 res = &PL_sv_undef;
503 }
504 break; 498 break;
505 499
506 case BER_TYPE_BOOL: 500 case BER_TYPE_BOOL:
507 {
508 UV len = get_length ();
509
510 if (len != 1) 501 if (expect_false (len != 1))
511 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len); 502 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
512 503
513 res = newSVcacheint (!!get_u8 ()); 504 res = newSVcacheint (!!get_u8 ());
514 }
515 break; 505 break;
516 506
517 case BER_TYPE_OID: 507 case BER_TYPE_OID:
518 res = decode_oid (0); 508 res = decode_oid (len, 0);
519 break; 509 break;
520 510
521 case BER_TYPE_RELOID: 511 case BER_TYPE_RELOID:
522 res = decode_oid (1); 512 res = decode_oid (len, 1);
523 break; 513 break;
524 514
525 case BER_TYPE_INT: 515 case BER_TYPE_INT:
526 res = decode_int (); 516 res = decode_int (len);
527 break; 517 break;
528 518
529 case BER_TYPE_UTF8: 519 case BER_TYPE_UTF8:
530 res = decode_data (); 520 res = decode_data (len);
531 SvUTF8_on (res); 521 SvUTF8_on (res);
532 break; 522 break;
533 523
534 case BER_TYPE_BYTES: 524 case BER_TYPE_BYTES:
535 res = decode_data (); 525 res = decode_data (len);
536 break; 526 break;
537 527
538 case BER_TYPE_IPADDRESS: 528 case BER_TYPE_IPADDRESS:
539 { 529 {
540 UV len = get_length ();
541
542 if (len != 4) 530 if (len != 4)
543 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len); 531 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
544 532
545 U8 *data = get_n (4); 533 U8 *data = get_n (4);
546 res = newSVpvf ("%d.%d.%d.%d", data [0], data [1], data [2], data [3]); 534 res = newSVpvf ("%d.%d.%d.%d", data [0], data [1], data [2], data [3]);
547 } 535 }
548 break; 536 break;
549 537
550 case BER_TYPE_UCS2: 538 case BER_TYPE_UCS2:
551 res = decode_ucs (2); 539 res = decode_ucs (len, 2);
552 break; 540 break;
553 541
554 case BER_TYPE_UCS4: 542 case BER_TYPE_UCS4:
555 res = decode_ucs (4); 543 res = decode_ucs (len, 4);
556 break; 544 break;
557 545
558 case BER_TYPE_REAL: 546 case BER_TYPE_REAL:
559 error ("BER_TYPE_REAL not implemented"); 547 error ("BER_TYPE_REAL not implemented");
560 548
561 case BER_TYPE_CROAK: 549 case BER_TYPE_CROAK:
562 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag); 550 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
563 551
564 default: 552 default:
565 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 553 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
566 } 554 }
555 }
567 556
568 AV *av = newAV (); 557 AV *av = newAV ();
569 av_fill (av, BER_ARRAYSIZE - 1); 558 av_fill (av, BER_ARRAYSIZE - 1);
570 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass); 559 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
571 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 560 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);

Diff Legend

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