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.14 by root, Sat Apr 20 14:09:56 2019 UTC vs.
Revision 1.22 by root, Sat Apr 20 18:38:33 2019 UTC

8// sscanf format modifiers and more. 8// sscanf format modifiers and more.
9 9
10enum { 10enum {
11 // ASN_TAG 11 // ASN_TAG
12 ASN_BOOLEAN = 0x01, 12 ASN_BOOLEAN = 0x01,
13 ASN_INTEGER32 = 0x02, 13 ASN_INTEGER = 0x02,
14 ASN_BIT_STRING = 0x03, 14 ASN_BIT_STRING = 0x03,
15 ASN_OCTET_STRING = 0x04, 15 ASN_OCTET_STRING = 0x04,
16 ASN_NULL = 0x05, 16 ASN_NULL = 0x05,
17 ASN_OBJECT_IDENTIFIER = 0x06, 17 ASN_OBJECT_IDENTIFIER = 0x06,
18 ASN_OID = 0x06, 18 ASN_OID = 0x06,
58 ASN_CLASS_SHIFT = 6, 58 ASN_CLASS_SHIFT = 6,
59 59
60 // ASN_APPLICATION SNMP 60 // ASN_APPLICATION SNMP
61 SNMP_IPADDRESS = 0x00, 61 SNMP_IPADDRESS = 0x00,
62 SNMP_COUNTER32 = 0x01, 62 SNMP_COUNTER32 = 0x01,
63 SNMP_GAUGE32 = 0x02,
63 SNMP_UNSIGNED32 = 0x02, 64 SNMP_UNSIGNED32 = 0x02,
64 SNMP_TIMETICKS = 0x03, 65 SNMP_TIMETICKS = 0x03,
65 SNMP_OPAQUE = 0x04, 66 SNMP_OPAQUE = 0x04,
66 SNMP_COUNTER64 = 0x06, 67 SNMP_COUNTER64 = 0x06,
67}; 68};
80 BER_TYPE_IPADDRESS, 81 BER_TYPE_IPADDRESS,
81 BER_TYPE_CROAK, 82 BER_TYPE_CROAK,
82}; 83};
83 84
84enum { 85enum {
85 BER_CLASS = 0, 86 BER_CLASS = 0,
86 BER_TAG = 1, 87 BER_TAG = 1,
87 BER_CONSTRUCTED = 2, 88 BER_FLAGS = 2,
88 BER_DATA = 3, 89 BER_DATA = 3,
89 BER_ARRAYSIZE 90 BER_ARRAYSIZE
90}; 91};
91 92
92#define MAX_OID_STRLEN 4096 93#define MAX_OID_STRLEN 4096
93 94
191 int klass; 192 int klass;
192 int tag; 193 int tag;
193 int type; 194 int type;
194 } *celem, default_map[] = { 195 } *celem, default_map[] = {
195 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL }, 196 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },
196 { ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT }, 197 { ASN_UNIVERSAL, ASN_INTEGER , BER_TYPE_INT },
197 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL }, 198 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },
198 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID }, 199 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID },
199 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID }, 200 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
200 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL }, 201 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
201 { ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT }, 202 { ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
248 249
249 return *cur++; 250 return *cur++;
250} 251}
251 252
252// get ber-encoded integer (i.e. pack "w") 253// get ber-encoded integer (i.e. pack "w")
253static U32 254static UV
254get_w (void) 255get_w (void)
255{ 256{
256 U32 res = 0; 257 UV res = 0;
258 U8 c = get_u8 ();
259
260 if (expect_false (c == 0x80))
261 error ("illegal BER padding (X.690 8.1.2.4.2, 8.19.2)");
257 262
258 for (;;) 263 for (;;)
259 { 264 {
260 U8 c = get_u8 ();
261 res = (res << 7) | (c & 0x7f); 265 res = (res << 7) | (c & 0x7f);
262 266
263 if (!(c & 0x80)) 267 if (!(c & 0x80))
264 return res; 268 return res;
265 }
266}
267 269
270 c = get_u8 ();
271 }
272}
273
268static U32 274static UV
269get_length (void) 275get_length (void)
270{ 276{
271 U32 res = get_u8 (); 277 UV res = get_u8 ();
272 278
273 if (res & 0x80) 279 if (res & 0x80)
274 { 280 {
275 int cnt = res & 0x7f; 281 int cnt = res & 0x7f;
276 res = 0; 282 res = 0;
277 283
278 switch (cnt) 284 switch (cnt)
279 { 285 {
280 case 0: 286 case 0:
281 error ("indefinite ASN.1 lengths not supported"); 287 error ("indefinite ASN.1 lengths not supported");
282 return 0; 288
289 case 0x7f:
290 error ("ASN.1 reserved value in length (X.690 8.1.3.5)");
283 291
284 default: 292 default:
285 error ("ASN.1 length too long"); 293 error ("ASN.1 length too long (only up to 2**64 octets supported)");
286 return 0;
287 294
295 case 8: res = (res << 8) | get_u8 ();
296 case 7: res = (res << 8) | get_u8 ();
297 case 6: res = (res << 8) | get_u8 ();
298 case 5: res = (res << 8) | get_u8 ();
288 case 4: res = (res << 8) | get_u8 (); 299 case 4: res = (res << 8) | get_u8 ();
289 case 3: res = (res << 8) | get_u8 (); 300 case 3: res = (res << 8) | get_u8 ();
290 case 2: res = (res << 8) | get_u8 (); 301 case 2: res = (res << 8) | get_u8 ();
291 case 1: res = (res << 8) | get_u8 (); 302 case 1: res = (res << 8) | get_u8 ();
292 } 303 }
296} 307}
297 308
298static SV * 309static SV *
299decode_int (void) 310decode_int (void)
300{ 311{
301 int len = get_length (); 312 UV len = get_length ();
302 313
303 if (len <= 0) 314 if (!len)
304 {
305 error ("integer length equal to zero"); 315 error ("invalid integer length equal to zero (X.690 8.3.1)");
306 return 0;
307 }
308 316
309 U8 *data = get_n (len); 317 U8 *data = get_n (len);
318
319 if (expect_false (len > 1))
320 {
321 U16 mask = (data [0] << 8) | data [1] & 0xff80;
322
323 if (expect_false (mask == 0xff80 || mask == 0x0000))
324 error ("illegal padding in integer (X.690 8.3.2)");
325 }
310 326
311 int negative = data [0] & 0x80; 327 int negative = data [0] & 0x80;
312 328
313 UV val = negative ? -1 : 0; // copy signbit to all bits 329 UV val = negative ? -1 : 0; // copy signbit to all bits
314 330
322} 338}
323 339
324static SV * 340static SV *
325decode_data (void) 341decode_data (void)
326{ 342{
327 U32 len = get_length (); 343 UV len = get_length ();
328 U8 *data = get_n (len);
329 return newSVpvn ((char *)data, len); 344 return newSVpvn ((char *)get_n (len), len);
330} 345}
331 346
332// gelper for decode_object_identifier 347// helper for decode_object_identifier
333static char * 348static char *
334write_uv (char *buf, U32 u) 349write_uv (char *buf, UV u)
335{ 350{
336 // the one-digit case is absolutely predominant, so this pays off (hopefully) 351 // the one-digit case is absolutely predominant, so this pays off (hopefully)
337 if (expect_true (u < 10)) 352 if (expect_true (u < 10))
338 *buf++ = u + '0'; 353 *buf++ = u + '0';
339 else 354 else
340 { 355 {
341 // this *could* be done much faster using branchless fixed-ppint arithmetics 356 // this *could* be done much faster using branchless fixed-point arithmetics
342 char *beg = buf; 357 char *beg = buf;
343 358
344 do 359 do
345 { 360 {
346 *buf++ = u % 10 + '0'; 361 *buf++ = u % 10 + '0';
363} 378}
364 379
365static SV * 380static SV *
366decode_oid (int relative) 381decode_oid (int relative)
367{ 382{
368 U32 len = get_length (); 383 UV len = get_length ();
369 384
370 if (len <= 0) 385 if (len <= 0)
371 { 386 {
372 error ("OBJECT IDENTIFIER length equal to zero"); 387 error ("OBJECT IDENTIFIER length equal to zero");
373 return &PL_sv_undef; 388 return &PL_sv_undef;
374 } 389 }
375 390
376 U8 *end = cur + len; 391 U8 *end = cur + len;
377 U32 w = get_w (); 392 UV w = get_w ();
378 393
379 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack 394 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack
380 char *app = oid; 395 char *app = oid;
381 396
382 if (relative) 397 if (relative)
383 app = write_uv (app, w); 398 app = write_uv (app, w);
384 else 399 else if (w < 2 * 40)
385 { 400 {
386 app = write_uv (app, (U8)w / 40); 401 app = write_uv (app, (U8)w / 40);
387 *app++ = '.'; 402 *app++ = '.';
388 app = write_uv (app, (U8)w % 40); 403 app = write_uv (app, (U8)w % 40);
389 } 404 }
405 else
406 {
407 app = write_uv (app, 2);
408 *app++ = '.';
409 app = write_uv (app, w - 2 * 40);
410 }
390 411
391 while (cur < end) 412 while (cur < end)
392 { 413 {
393 // we assume an oid component is never > 64 digits 414 // we assume an oid component is never > 64 digits
394 if (oid + sizeof (oid) - app < 64) 415 if (oid + sizeof (oid) - app < 64)
406static SV * 427static SV *
407decode_ucs (int chrsize) 428decode_ucs (int chrsize)
408{ 429{
409 SV *res = NEWSV (0, 0); 430 SV *res = NEWSV (0, 0);
410 431
411 U32 len = get_length (); 432 UV len = get_length ();
412 433
413 if (len & (chrsize - 1)) 434 if (len & (chrsize - 1))
414 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len); 435 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
415 436
416 while (len) 437 while (len)
450 int tag = identifier & ASN_TAG_MASK; 471 int tag = identifier & ASN_TAG_MASK;
451 472
452 if (tag == ASN_TAG_BER) 473 if (tag == ASN_TAG_BER)
453 tag = get_w (); 474 tag = get_w ();
454 475
455 if (tag == ASN_TAG_BER)
456 tag = get_w ();
457
458 if (constructed) 476 if (constructed)
459 { 477 {
460 U32 len = get_length (); 478 UV len = get_length ();
461 U32 seqend = (cur - buf) + len; 479 UV seqend = (cur - buf) + len;
462 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 480 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
463 481
464 while (cur < buf + seqend) 482 while (cur < buf + seqend)
465 av_push (av, decode_ber ()); 483 av_push (av, decode_ber ());
466 484
467 if (cur > buf + seqend) 485 if (cur > buf + seqend)
468 croak ("constructed type %02x overflow (%x %x)\n", identifier, cur - buf, seqend); 486 croak ("constructed type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
469 487
470 res = newRV_inc ((SV *)av); 488 res = newRV_inc ((SV *)av);
471 } 489 }
472 else 490 else
473 switch (profile_lookup (cur_profile, klass, tag)) 491 switch (profile_lookup (cur_profile, klass, tag))
474 { 492 {
475 case BER_TYPE_NULL: 493 case BER_TYPE_NULL:
476 { 494 {
477 U32 len = get_length (); 495 UV len = get_length ();
478 496
479 if (len) 497 if (len)
480 croak ("BER_TYPE_NULL value with non-zero length %d encountered", len); 498 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
481 499
482 res = &PL_sv_undef; 500 res = &PL_sv_undef;
483 } 501 }
484 break; 502 break;
485 503
486 case BER_TYPE_BOOL: 504 case BER_TYPE_BOOL:
487 { 505 {
488 U32 len = get_length (); 506 UV len = get_length ();
489 507
490 if (len != 1) 508 if (len != 1)
491 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len); 509 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
492 510
493 res = newSVcacheint (!!get_u8 ()); 511 res = newSVcacheint (!!get_u8 ());
494 } 512 }
495 break; 513 break;
496 514
515 res = decode_data (); 533 res = decode_data ();
516 break; 534 break;
517 535
518 case BER_TYPE_IPADDRESS: 536 case BER_TYPE_IPADDRESS:
519 { 537 {
520 U32 len = get_length (); 538 UV len = get_length ();
521 539
522 if (len != 4) 540 if (len != 4)
523 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 541 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
524 542
525 U8 c1 = get_u8 (); 543 U8 c1 = get_u8 ();
526 U8 c2 = get_u8 (); 544 U8 c2 = get_u8 ();
527 U8 c3 = get_u8 (); 545 U8 c3 = get_u8 ();
528 U8 c4 = get_u8 (); 546 U8 c4 = get_u8 ();
545 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 563 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
546 } 564 }
547 565
548 AV *av = newAV (); 566 AV *av = newAV ();
549 av_fill (av, BER_ARRAYSIZE - 1); 567 av_fill (av, BER_ARRAYSIZE - 1);
550 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 568 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
551 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 569 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
552 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 570 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
553 AvARRAY (av)[BER_DATA ] = res; 571 AvARRAY (av)[BER_DATA ] = res;
554 572
555 return newRV_noinc ((SV *)av); 573 return newRV_noinc ((SV *)av);
556} 574}
557 575
558///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
563strlen_sum (STRLEN l1, STRLEN l2) 581strlen_sum (STRLEN l1, STRLEN l2)
564{ 582{
565 size_t sum = l1 + l2; 583 size_t sum = l1 + l2;
566 584
567 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 585 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
568 croak ("JSON::XS: string size overflow"); 586 croak ("Convert::BER::XS: string size overflow");
569 587
570 return sum; 588 return sum;
571} 589}
572 590
573static void 591static void
611 need (1); 629 need (1);
612 *cur++ = val; 630 *cur++ = val;
613} 631}
614 632
615static void 633static void
616put_w_nocheck (U32 val) 634put_w_nocheck (UV val)
617{ 635{
636#if UVSIZE > 4
637 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
638 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
639 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
640 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
641 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
642#endif
618 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 643 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
619 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 644 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
620 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 645 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
621 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 646 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
622 *cur = val & 0x7f; cur += 1; 647 *cur = val & 0x7f; cur += 1;
623} 648}
624 649
625static void 650static void
626put_w (U32 val) 651put_w (UV val)
627{ 652{
628 need (5); // we only handle up to 5 bytes 653 need (5); // we only handle up to 5 bytes
629 654
630 put_w_nocheck (val); 655 put_w_nocheck (val);
631} 656}
632 657
633static U8 * 658static U8 *
634put_length_at (U32 val, U8 *cur) 659put_length_at (UV val, U8 *cur)
635{ 660{
636 if (val < 0x7fU) 661 if (val < 0x7fU)
637 *cur++ = val; 662 *cur++ = val;
638 else 663 else
639 { 664 {
640 U8 *lenb = cur++; 665 U8 *lenb = cur++;
641 666
667#if UVSIZE > 4
668 *cur = val >> 56; cur += *cur > 0;
669 *cur = val >> 48; cur += *cur > 0;
670 *cur = val >> 40; cur += *cur > 0;
671 *cur = val >> 32; cur += *cur > 0;
672#endif
642 *cur = val >> 24; cur += *cur > 0; 673 *cur = val >> 24; cur += *cur > 0;
643 *cur = val >> 16; cur += *cur > 0; 674 *cur = val >> 16; cur += *cur > 0;
644 *cur = val >> 8; cur += *cur > 0; 675 *cur = val >> 8; cur += *cur > 0;
645 *cur = val ; cur += 1; 676 *cur = val ; cur += 1;
646 677
649 680
650 return cur; 681 return cur;
651} 682}
652 683
653static void 684static void
654put_length (U32 val) 685put_length (UV val)
655{ 686{
656 need (5 + val); 687 need (5 + val);
657 cur = put_length_at (val, cur); 688 cur = put_length_at (val, cur);
658} 689}
659 690
660// return how many bytes the encoded length requires 691// return how many bytes the encoded length requires
661static int length_length (U32 val) 692static int length_length (UV val)
662{ 693{
663 return val < 0x7fU 694 return val < 0x7fU
664 ? 1 695 ? 1
665 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 696 : 2
697 + (val > 0xffU)
698 + (val > 0xffffU)
699 + (val > 0xffffffU)
700#if UVSIZE > 4
701 + (val > 0xffffffffU)
702 + (val > 0xffffffffffU)
703 + (val > 0xffffffffffffU)
704 + (val > 0xffffffffffffffU)
705#endif
706 ;
666} 707}
667 708
668static void 709static void
669encode_data (const char *ptr, STRLEN len) 710encode_data (const char *ptr, STRLEN len)
670{ 711{
732 773
733 *lenb = cur - lenb - 1; 774 *lenb = cur - lenb - 1;
734} 775}
735 776
736// we don't know the length yet, so we optimistically 777// we don't know the length yet, so we optimistically
737// assume the length will need one octet later. if that 778// assume the length will need one octet later. If that
738// turns out to be wrong, we memove as needed. 779// turns out to be wrong, we memmove as needed.
739// mark the beginning 780// mark the beginning
740static STRLEN 781static STRLEN
741len_fixup_mark (void) 782len_fixup_mark (void)
742{ 783{
743 return cur++ - buf; 784 return cur++ - buf;
855{ 896{
856 AV *av = ber_tuple (tuple); 897 AV *av = ber_tuple (tuple);
857 898
858 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 899 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
859 int tag = SvIV (AvARRAY (av)[BER_TAG]); 900 int tag = SvIV (AvARRAY (av)[BER_TAG]);
860 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 901 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
861 SV *data = AvARRAY (av)[BER_DATA]; 902 SV *data = AvARRAY (av)[BER_DATA];
862 903
863 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 904 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
864 905
865 if (expect_false (tag >= ASN_TAG_BER)) 906 if (expect_false (tag >= ASN_TAG_BER))
899 put_length (0); 940 put_length (0);
900 break; 941 break;
901 942
902 case BER_TYPE_BOOL: 943 case BER_TYPE_BOOL:
903 put_length (1); 944 put_length (1);
904 *cur++ = SvTRUE (data) ? 0xff : 0x00; 945 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
905 break; 946 break;
906 947
907 case BER_TYPE_OID: 948 case BER_TYPE_OID:
908 encode_oid (data, 0); 949 encode_oid (data, 0);
909 break; 950 break;
972 const char *name; 1013 const char *name;
973 IV iv; 1014 IV iv;
974 } *civ, const_iv[] = { 1015 } *civ, const_iv[] = {
975#define const_iv(name) { # name, name }, 1016#define const_iv(name) { # name, name },
976 const_iv (ASN_BOOLEAN) 1017 const_iv (ASN_BOOLEAN)
977 const_iv (ASN_INTEGER32) 1018 const_iv (ASN_INTEGER)
978 const_iv (ASN_BIT_STRING) 1019 const_iv (ASN_BIT_STRING)
979 const_iv (ASN_OCTET_STRING) 1020 const_iv (ASN_OCTET_STRING)
980 const_iv (ASN_NULL) 1021 const_iv (ASN_NULL)
981 const_iv (ASN_OBJECT_IDENTIFIER) 1022 const_iv (ASN_OBJECT_IDENTIFIER)
982 const_iv (ASN_OBJECT_DESCRIPTOR) 1023 const_iv (ASN_OBJECT_DESCRIPTOR)
1011 const_iv (ASN_CONTEXT) 1052 const_iv (ASN_CONTEXT)
1012 const_iv (ASN_PRIVATE) 1053 const_iv (ASN_PRIVATE)
1013 1054
1014 const_iv (BER_CLASS) 1055 const_iv (BER_CLASS)
1015 const_iv (BER_TAG) 1056 const_iv (BER_TAG)
1016 const_iv (BER_CONSTRUCTED) 1057 const_iv (BER_FLAGS)
1017 const_iv (BER_DATA) 1058 const_iv (BER_DATA)
1018 1059
1019 const_iv (BER_TYPE_BYTES) 1060 const_iv (BER_TYPE_BYTES)
1020 const_iv (BER_TYPE_UTF8) 1061 const_iv (BER_TYPE_UTF8)
1021 const_iv (BER_TYPE_UCS2) 1062 const_iv (BER_TYPE_UCS2)
1029 const_iv (BER_TYPE_IPADDRESS) 1070 const_iv (BER_TYPE_IPADDRESS)
1030 const_iv (BER_TYPE_CROAK) 1071 const_iv (BER_TYPE_CROAK)
1031 1072
1032 const_iv (SNMP_IPADDRESS) 1073 const_iv (SNMP_IPADDRESS)
1033 const_iv (SNMP_COUNTER32) 1074 const_iv (SNMP_COUNTER32)
1075 const_iv (SNMP_GAUGE32)
1034 const_iv (SNMP_UNSIGNED32) 1076 const_iv (SNMP_UNSIGNED32)
1035 const_iv (SNMP_TIMETICKS) 1077 const_iv (SNMP_TIMETICKS)
1036 const_iv (SNMP_OPAQUE) 1078 const_iv (SNMP_OPAQUE)
1037 const_iv (SNMP_COUNTER64) 1079 const_iv (SNMP_COUNTER64)
1038 }; 1080 };
1039 1081
1040 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) 1082 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
1041 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1083 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1042} 1084}
1043 1085
1044SV * 1086void
1045ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1087ber_decode (SV *ber, SV *profile = &PL_sv_undef)
1088 ALIAS:
1089 ber_decode_prefix = 1
1046 CODE: 1090 PPCODE:
1047{ 1091{
1048 cur_profile = SvPROFILE (profile); 1092 cur_profile = SvPROFILE (profile);
1049 STRLEN len; 1093 STRLEN len;
1050 buf = (U8 *)SvPVbyte (ber, len); 1094 buf = (U8 *)SvPVbyte (ber, len);
1051 cur = buf; 1095 cur = buf;
1052 end = buf + len; 1096 end = buf + len;
1053 1097
1054 RETVAL = decode_ber (); 1098 SV *tuple = decode_ber ();
1099
1100 EXTEND (SP, 2);
1101 PUSHs (sv_2mortal (tuple));
1102
1103 if (ix)
1104 PUSHs (sv_2mortal (newSViv (cur - buf)));
1105 else if (cur != end)
1106 error ("trailing garbage after BER data");
1055} 1107}
1056 OUTPUT: RETVAL
1057 1108
1058void 1109void
1059ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &PL_sv_undef, SV *data = &PL_sv_undef) 1110ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *flags = &PL_sv_undef, SV *data = &PL_sv_undef)
1060 PPCODE: 1111 PPCODE:
1061{ 1112{
1062 if (!SvOK (tuple)) 1113 if (!SvOK (tuple))
1063 XSRETURN_NO; 1114 XSRETURN_NO;
1064 1115
1066 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1117 croak ("ber_is: tuple must be BER tuple (array-ref)");
1067 1118
1068 AV *av = (AV *)SvRV (tuple); 1119 AV *av = (AV *)SvRV (tuple);
1069 1120
1070 XPUSHs ( 1121 XPUSHs (
1071 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1122 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1072 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1123 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1073 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1124 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1074 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1125 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1075 ? &PL_sv_yes : &PL_sv_undef); 1126 ? &PL_sv_yes : &PL_sv_undef);
1076} 1127}
1077 1128
1078void 1129void
1079ber_is_seq (SV *tuple) 1130ber_is_seq (SV *tuple)
1083 XSRETURN_UNDEF; 1134 XSRETURN_UNDEF;
1084 1135
1085 AV *av = ber_tuple (tuple); 1136 AV *av = ber_tuple (tuple);
1086 1137
1087 XPUSHs ( 1138 XPUSHs (
1088 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1139 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1089 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1140 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1090 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1141 && SvIV (AvARRAY (av)[BER_FLAGS])
1091 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1142 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1092} 1143}
1093 1144
1094void 1145void
1095ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1146ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1096 PPCODE: 1147 PPCODE:
1097{ 1148{
1098 if (!SvOK (tuple)) 1149 if (!SvOK (tuple))
1099 XSRETURN_NO; 1150 XSRETURN_NO;
1100 1151
1101 AV *av = ber_tuple (tuple); 1152 AV *av = ber_tuple (tuple);
1102 1153
1103 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1154 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1104 1155
1105 XPUSHs ( 1156 XPUSHs (
1106 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1157 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1107 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1158 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1108 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1159 && !SvIV (AvARRAY (av)[BER_FLAGS])
1109 && (!SvOK (value) || data == SvIV (value)) 1160 && (!SvOK (value) || data == SvUV (value))
1110 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1161 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1111 : &PL_sv_undef); 1162 : &PL_sv_undef);
1112} 1163}
1113 1164
1114void 1165void
1115ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1166ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
1119 XSRETURN_NO; 1170 XSRETURN_NO;
1120 1171
1121 AV *av = ber_tuple (tuple); 1172 AV *av = ber_tuple (tuple);
1122 1173
1123 XPUSHs ( 1174 XPUSHs (
1124 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1175 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1125 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1176 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1126 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1177 && !SvIV (AvARRAY (av)[BER_FLAGS])
1127 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1178 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1128 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1179 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1129} 1180}
1130 1181
1131############################################################################# 1182#############################################################################
1144 SvCUR_set (buf_sv, cur - buf); 1195 SvCUR_set (buf_sv, cur - buf);
1145 XPUSHs (buf_sv); 1196 XPUSHs (buf_sv);
1146} 1197}
1147 1198
1148SV * 1199SV *
1149ber_i32 (IV iv) 1200ber_int (SV *sv)
1150 CODE: 1201 CODE:
1151{ 1202{
1152 AV *av = newAV (); 1203 AV *av = newAV ();
1153 av_fill (av, BER_ARRAYSIZE - 1); 1204 av_fill (av, BER_ARRAYSIZE - 1);
1154 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1205 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1155 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1206 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1156 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1207 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1157 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1208 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1158 RETVAL = newRV_noinc ((SV *)av); 1209 RETVAL = newRV_noinc ((SV *)av);
1159} 1210}
1160 OUTPUT: RETVAL 1211 OUTPUT: RETVAL
1161 1212
1162# TODO: not arrayref, but elements? 1213# TODO: not arrayref, but elements?
1164ber_seq (SV *arrayref) 1215ber_seq (SV *arrayref)
1165 CODE: 1216 CODE:
1166{ 1217{
1167 AV *av = newAV (); 1218 AV *av = newAV ();
1168 av_fill (av, BER_ARRAYSIZE - 1); 1219 av_fill (av, BER_ARRAYSIZE - 1);
1169 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1220 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1170 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1221 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1171 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1222 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1172 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1223 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1173 RETVAL = newRV_noinc ((SV *)av); 1224 RETVAL = newRV_noinc ((SV *)av);
1174} 1225}
1175 OUTPUT: RETVAL 1226 OUTPUT: RETVAL
1176 1227
1177MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1228MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines