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.12 by root, Sat Apr 20 12:35:03 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
181 182
182 SvPVX (sv)[idx] = type; 183 SvPVX (sv)[idx] = type;
183} 184}
184 185
185static SV * 186static SV *
186profile_new () 187profile_new (void)
187{ 188{
188 SV *sv = newSVpvn ("", 0); 189 SV *sv = newSVpvn ("", 0);
189 190
190 static const struct { 191 static const struct {
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_OBJECT_DESCRIPTOR, BER_TYPE_OID },
200 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID }, 200 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
201 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL }, 201 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
202 { ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
202 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 }, 203 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },
203 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 }, 204 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },
204 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 }, 205 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },
205 }; 206 };
206 207
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 }
294 305
295 return res; 306 return res;
296} 307}
297 308
298static SV * 309static SV *
299decode_int () 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 {
356 // this *could* be done much faster using branchless fixed-point arithmetics
341 char *beg = buf; 357 char *beg = buf;
342 358
343 do 359 do
344 { 360 {
345 *buf++ = u % 10 + '0'; 361 *buf++ = u % 10 + '0';
347 } 363 }
348 while (u); 364 while (u);
349 365
350 // reverse digits 366 // reverse digits
351 char *ptr = buf; 367 char *ptr = buf;
352 while (--ptr != beg) 368 while (--ptr > beg)
353 { 369 {
354 char c = *ptr; 370 char c = *ptr;
355 *ptr = *beg; 371 *ptr = *beg;
356 *beg = c; 372 *beg = c;
357 ++beg; 373 ++beg;
362} 378}
363 379
364static SV * 380static SV *
365decode_oid (int relative) 381decode_oid (int relative)
366{ 382{
367 U32 len = get_length (); 383 UV len = get_length ();
368 384
369 if (len <= 0) 385 if (len <= 0)
370 { 386 {
371 error ("OBJECT IDENTIFIER length equal to zero"); 387 error ("OBJECT IDENTIFIER length equal to zero");
372 return &PL_sv_undef; 388 return &PL_sv_undef;
373 } 389 }
374 390
375 U8 *end = cur + len; 391 U8 *end = cur + len;
376 U32 w = get_w (); 392 UV w = get_w ();
377 393
378 static char oid[MAX_OID_STRLEN]; // must be static 394 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack
379 char *app = oid; 395 char *app = oid;
380 396
381 if (relative) 397 if (relative)
382 app = write_uv (app, w); 398 app = write_uv (app, w);
383 else 399 else if (w < 2 * 40)
384 { 400 {
385 app = write_uv (app, (U8)w / 40); 401 app = write_uv (app, (U8)w / 40);
386 *app++ = '.'; 402 *app++ = '.';
387 app = write_uv (app, (U8)w % 40); 403 app = write_uv (app, (U8)w % 40);
388 } 404 }
405 else
406 {
407 app = write_uv (app, 2);
408 *app++ = '.';
409 app = write_uv (app, w - 2 * 40);
410 }
389 411
412 while (cur < end)
413 {
390 // we assume an oid component is never > 64 bytes 414 // we assume an oid component is never > 64 digits
391 while (cur < end && oid + sizeof (oid) - app > 64) 415 if (oid + sizeof (oid) - app < 64)
392 { 416 croak ("BER_TYPE_OID to long to decode");
417
393 w = get_w (); 418 w = get_w ();
394 *app++ = '.'; 419 *app++ = '.';
395 app = write_uv (app, w); 420 app = write_uv (app, w);
396 } 421 }
397 422
402static SV * 427static SV *
403decode_ucs (int chrsize) 428decode_ucs (int chrsize)
404{ 429{
405 SV *res = NEWSV (0, 0); 430 SV *res = NEWSV (0, 0);
406 431
407 U32 len = get_length (); 432 UV len = get_length ();
408 433
409 if (len & (chrsize - 1)) 434 if (len & (chrsize - 1))
410 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);
411 436
412 while (len) 437 while (len)
433 458
434 return res; 459 return res;
435} 460}
436 461
437static SV * 462static SV *
438decode_ber () 463decode_ber (void)
439{ 464{
440 int identifier = get_u8 (); 465 int identifier = get_u8 ();
441 466
442 SV *res; 467 SV *res;
443 468
446 int tag = identifier & ASN_TAG_MASK; 471 int tag = identifier & ASN_TAG_MASK;
447 472
448 if (tag == ASN_TAG_BER) 473 if (tag == ASN_TAG_BER)
449 tag = get_w (); 474 tag = get_w ();
450 475
451 if (tag == ASN_TAG_BER)
452 tag = get_w ();
453
454 if (constructed) 476 if (constructed)
455 { 477 {
456 U32 len = get_length (); 478 UV len = get_length ();
457 U32 seqend = (cur - buf) + len; 479 UV seqend = (cur - buf) + len;
458 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 480 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
459 481
460 while (cur < buf + seqend) 482 while (cur < buf + seqend)
461 av_push (av, decode_ber ()); 483 av_push (av, decode_ber ());
462 484
463 if (cur > buf + seqend) 485 if (cur > buf + seqend)
464 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);
465 487
466 res = newRV_inc ((SV *)av); 488 res = newRV_inc ((SV *)av);
467 } 489 }
468 else 490 else
469 switch (profile_lookup (cur_profile, klass, tag)) 491 switch (profile_lookup (cur_profile, klass, tag))
470 { 492 {
471 case BER_TYPE_NULL: 493 case BER_TYPE_NULL:
494 {
495 UV len = get_length ();
496
497 if (len)
498 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
499
472 res = &PL_sv_undef; 500 res = &PL_sv_undef;
501 }
473 break; 502 break;
474 503
475 case BER_TYPE_BOOL: 504 case BER_TYPE_BOOL:
476 { 505 {
477 U32 len = get_length (); 506 UV len = get_length ();
478 507
479 if (len != 1) 508 if (len != 1)
480 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len); 509 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
481 510
482 res = newSVcacheint (get_u8 () ? 0 : 1); 511 res = newSVcacheint (!!get_u8 ());
483 } 512 }
484 break; 513 break;
485 514
486 case BER_TYPE_OID: 515 case BER_TYPE_OID:
487 res = decode_oid (0); 516 res = decode_oid (0);
504 res = decode_data (); 533 res = decode_data ();
505 break; 534 break;
506 535
507 case BER_TYPE_IPADDRESS: 536 case BER_TYPE_IPADDRESS:
508 { 537 {
509 U32 len = get_length (); 538 UV len = get_length ();
510 539
511 if (len != 4) 540 if (len != 4)
512 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);
513 542
514 U8 c1 = get_u8 (); 543 U8 c1 = get_u8 ();
515 U8 c2 = get_u8 (); 544 U8 c2 = get_u8 ();
516 U8 c3 = get_u8 (); 545 U8 c3 = get_u8 ();
517 U8 c4 = get_u8 (); 546 U8 c4 = get_u8 ();
534 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 563 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
535 } 564 }
536 565
537 AV *av = newAV (); 566 AV *av = newAV ();
538 av_fill (av, BER_ARRAYSIZE - 1); 567 av_fill (av, BER_ARRAYSIZE - 1);
539 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 568 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
540 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 569 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
541 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 570 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
542 AvARRAY (av)[BER_DATA ] = res; 571 AvARRAY (av)[BER_DATA ] = res;
543 572
544 return newRV_noinc ((SV *)av); 573 return newRV_noinc ((SV *)av);
545} 574}
546 575
547///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
552strlen_sum (STRLEN l1, STRLEN l2) 581strlen_sum (STRLEN l1, STRLEN l2)
553{ 582{
554 size_t sum = l1 + l2; 583 size_t sum = l1 + l2;
555 584
556 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 585 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
557 croak ("JSON::XS: string size overflow"); 586 croak ("Convert::BER::XS: string size overflow");
558 587
559 return sum; 588 return sum;
560} 589}
561 590
562static void 591static void
600 need (1); 629 need (1);
601 *cur++ = val; 630 *cur++ = val;
602} 631}
603 632
604static void 633static void
605put_w_nocheck (U32 val) 634put_w_nocheck (UV val)
606{ 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
607 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 643 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
608 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 644 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
609 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 645 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
610 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 646 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
611 *cur = val & 0x7f; cur += 1; 647 *cur = val & 0x7f; cur += 1;
612} 648}
613 649
614static void 650static void
615put_w (U32 val) 651put_w (UV val)
616{ 652{
617 need (5); // we only handle up to 5 bytes 653 need (5); // we only handle up to 5 bytes
618 654
619 put_w_nocheck (val); 655 put_w_nocheck (val);
620} 656}
621 657
622static U8 * 658static U8 *
623put_length_at (U32 val, U8 *cur) 659put_length_at (UV val, U8 *cur)
624{ 660{
625 if (val < 0x7fU) 661 if (val < 0x7fU)
626 *cur++ = val; 662 *cur++ = val;
627 else 663 else
628 { 664 {
629 U8 *lenb = cur++; 665 U8 *lenb = cur++;
630 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
631 *cur = val >> 24; cur += *cur > 0; 673 *cur = val >> 24; cur += *cur > 0;
632 *cur = val >> 16; cur += *cur > 0; 674 *cur = val >> 16; cur += *cur > 0;
633 *cur = val >> 8; cur += *cur > 0; 675 *cur = val >> 8; cur += *cur > 0;
634 *cur = val ; cur += 1; 676 *cur = val ; cur += 1;
635 677
638 680
639 return cur; 681 return cur;
640} 682}
641 683
642static void 684static void
643put_length (U32 val) 685put_length (UV val)
644{ 686{
645 need (5 + val); 687 need (5 + val);
646 cur = put_length_at (val, cur); 688 cur = put_length_at (val, cur);
647} 689}
648 690
649// return how many bytes the encoded length requires 691// return how many bytes the encoded length requires
650static int length_length (U32 val) 692static int length_length (UV val)
651{ 693{
652 return val < 0x7fU 694 return val < 0x7fU
653 ? 1 695 ? 1
654 : 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 ;
655} 707}
656 708
657static void 709static void
658encode_data (const char *ptr, STRLEN len) 710encode_data (const char *ptr, STRLEN len)
659{ 711{
721 773
722 *lenb = cur - lenb - 1; 774 *lenb = cur - lenb - 1;
723} 775}
724 776
725// we don't know the length yet, so we optimistically 777// we don't know the length yet, so we optimistically
726// assume the length will need one octet later. if that 778// assume the length will need one octet later. If that
727// turns out to be wrong, we memove as needed. 779// turns out to be wrong, we memmove as needed.
728// mark the beginning 780// mark the beginning
729static STRLEN 781static STRLEN
730len_fixup_mark () 782len_fixup_mark (void)
731{ 783{
732 return cur++ - buf; 784 return cur++ - buf;
733} 785}
734 786
735// patch up the length 787// patch up the length
844{ 896{
845 AV *av = ber_tuple (tuple); 897 AV *av = ber_tuple (tuple);
846 898
847 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 899 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
848 int tag = SvIV (AvARRAY (av)[BER_TAG]); 900 int tag = SvIV (AvARRAY (av)[BER_TAG]);
849 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 901 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
850 SV *data = AvARRAY (av)[BER_DATA]; 902 SV *data = AvARRAY (av)[BER_DATA];
851 903
852 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 904 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
853 905
854 if (expect_false (tag >= ASN_TAG_BER)) 906 if (expect_false (tag >= ASN_TAG_BER))
888 put_length (0); 940 put_length (0);
889 break; 941 break;
890 942
891 case BER_TYPE_BOOL: 943 case BER_TYPE_BOOL:
892 put_length (1); 944 put_length (1);
893 *cur++ = SvTRUE (data) ? 0xff : 0x00; 945 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
894 break; 946 break;
895 947
896 case BER_TYPE_OID: 948 case BER_TYPE_OID:
897 encode_oid (data, 0); 949 encode_oid (data, 0);
898 break; 950 break;
961 const char *name; 1013 const char *name;
962 IV iv; 1014 IV iv;
963 } *civ, const_iv[] = { 1015 } *civ, const_iv[] = {
964#define const_iv(name) { # name, name }, 1016#define const_iv(name) { # name, name },
965 const_iv (ASN_BOOLEAN) 1017 const_iv (ASN_BOOLEAN)
966 const_iv (ASN_INTEGER32) 1018 const_iv (ASN_INTEGER)
967 const_iv (ASN_BIT_STRING) 1019 const_iv (ASN_BIT_STRING)
968 const_iv (ASN_OCTET_STRING) 1020 const_iv (ASN_OCTET_STRING)
969 const_iv (ASN_NULL) 1021 const_iv (ASN_NULL)
970 const_iv (ASN_OBJECT_IDENTIFIER) 1022 const_iv (ASN_OBJECT_IDENTIFIER)
971 const_iv (ASN_OBJECT_DESCRIPTOR) 1023 const_iv (ASN_OBJECT_DESCRIPTOR)
1000 const_iv (ASN_CONTEXT) 1052 const_iv (ASN_CONTEXT)
1001 const_iv (ASN_PRIVATE) 1053 const_iv (ASN_PRIVATE)
1002 1054
1003 const_iv (BER_CLASS) 1055 const_iv (BER_CLASS)
1004 const_iv (BER_TAG) 1056 const_iv (BER_TAG)
1005 const_iv (BER_CONSTRUCTED) 1057 const_iv (BER_FLAGS)
1006 const_iv (BER_DATA) 1058 const_iv (BER_DATA)
1007 1059
1008 const_iv (BER_TYPE_BYTES) 1060 const_iv (BER_TYPE_BYTES)
1009 const_iv (BER_TYPE_UTF8) 1061 const_iv (BER_TYPE_UTF8)
1010 const_iv (BER_TYPE_UCS2) 1062 const_iv (BER_TYPE_UCS2)
1018 const_iv (BER_TYPE_IPADDRESS) 1070 const_iv (BER_TYPE_IPADDRESS)
1019 const_iv (BER_TYPE_CROAK) 1071 const_iv (BER_TYPE_CROAK)
1020 1072
1021 const_iv (SNMP_IPADDRESS) 1073 const_iv (SNMP_IPADDRESS)
1022 const_iv (SNMP_COUNTER32) 1074 const_iv (SNMP_COUNTER32)
1075 const_iv (SNMP_GAUGE32)
1023 const_iv (SNMP_UNSIGNED32) 1076 const_iv (SNMP_UNSIGNED32)
1024 const_iv (SNMP_TIMETICKS) 1077 const_iv (SNMP_TIMETICKS)
1025 const_iv (SNMP_OPAQUE) 1078 const_iv (SNMP_OPAQUE)
1026 const_iv (SNMP_COUNTER64) 1079 const_iv (SNMP_COUNTER64)
1027 }; 1080 };
1028 1081
1029 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--)
1030 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1083 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1031} 1084}
1032 1085
1033SV * 1086void
1034ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1087ber_decode (SV *ber, SV *profile = &PL_sv_undef)
1088 ALIAS:
1089 ber_decode_prefix = 1
1035 CODE: 1090 PPCODE:
1036{ 1091{
1037 cur_profile = SvPROFILE (profile); 1092 cur_profile = SvPROFILE (profile);
1038 STRLEN len; 1093 STRLEN len;
1039 buf = (U8 *)SvPVbyte (ber, len); 1094 buf = (U8 *)SvPVbyte (ber, len);
1040 cur = buf; 1095 cur = buf;
1041 end = buf + len; 1096 end = buf + len;
1042 1097
1043 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");
1044} 1107}
1045 OUTPUT: RETVAL
1046 1108
1047void 1109void
1048ber_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)
1049 PPCODE: 1111 PPCODE:
1050{ 1112{
1051 if (!SvOK (tuple)) 1113 if (!SvOK (tuple))
1052 XSRETURN_NO; 1114 XSRETURN_NO;
1053 1115
1055 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1117 croak ("ber_is: tuple must be BER tuple (array-ref)");
1056 1118
1057 AV *av = (AV *)SvRV (tuple); 1119 AV *av = (AV *)SvRV (tuple);
1058 1120
1059 XPUSHs ( 1121 XPUSHs (
1060 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1122 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1061 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1123 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1062 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1124 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1063 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1125 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1064 ? &PL_sv_yes : &PL_sv_undef); 1126 ? &PL_sv_yes : &PL_sv_undef);
1065} 1127}
1066 1128
1067void 1129void
1068ber_is_seq (SV *tuple) 1130ber_is_seq (SV *tuple)
1072 XSRETURN_UNDEF; 1134 XSRETURN_UNDEF;
1073 1135
1074 AV *av = ber_tuple (tuple); 1136 AV *av = ber_tuple (tuple);
1075 1137
1076 XPUSHs ( 1138 XPUSHs (
1077 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1139 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1078 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1140 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1079 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1141 && SvIV (AvARRAY (av)[BER_FLAGS])
1080 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1142 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1081} 1143}
1082 1144
1083void 1145void
1084ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1146ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1085 PPCODE: 1147 PPCODE:
1086{ 1148{
1087 if (!SvOK (tuple)) 1149 if (!SvOK (tuple))
1088 XSRETURN_NO; 1150 XSRETURN_NO;
1089 1151
1090 AV *av = ber_tuple (tuple); 1152 AV *av = ber_tuple (tuple);
1091 1153
1092 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1154 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1093 1155
1094 XPUSHs ( 1156 XPUSHs (
1095 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1157 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1096 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1158 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1097 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1159 && !SvIV (AvARRAY (av)[BER_FLAGS])
1098 && (!SvOK (value) || data == SvIV (value)) 1160 && (!SvOK (value) || data == SvUV (value))
1099 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1161 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1100 : &PL_sv_undef); 1162 : &PL_sv_undef);
1101} 1163}
1102 1164
1103void 1165void
1104ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1166ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
1108 XSRETURN_NO; 1170 XSRETURN_NO;
1109 1171
1110 AV *av = ber_tuple (tuple); 1172 AV *av = ber_tuple (tuple);
1111 1173
1112 XPUSHs ( 1174 XPUSHs (
1113 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1175 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1114 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1176 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1115 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1177 && !SvIV (AvARRAY (av)[BER_FLAGS])
1116 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1178 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1117 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1179 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1118} 1180}
1119 1181
1120############################################################################# 1182#############################################################################
1133 SvCUR_set (buf_sv, cur - buf); 1195 SvCUR_set (buf_sv, cur - buf);
1134 XPUSHs (buf_sv); 1196 XPUSHs (buf_sv);
1135} 1197}
1136 1198
1137SV * 1199SV *
1138ber_i32 (IV iv) 1200ber_int (SV *sv)
1139 CODE: 1201 CODE:
1140{ 1202{
1141 AV *av = newAV (); 1203 AV *av = newAV ();
1142 av_fill (av, BER_ARRAYSIZE - 1); 1204 av_fill (av, BER_ARRAYSIZE - 1);
1143 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1205 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1144 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1206 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1145 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1207 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1146 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1208 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1147 RETVAL = newRV_noinc ((SV *)av); 1209 RETVAL = newRV_noinc ((SV *)av);
1148} 1210}
1149 OUTPUT: RETVAL 1211 OUTPUT: RETVAL
1150 1212
1151# TODO: not arrayref, but elements? 1213# TODO: not arrayref, but elements?
1153ber_seq (SV *arrayref) 1215ber_seq (SV *arrayref)
1154 CODE: 1216 CODE:
1155{ 1217{
1156 AV *av = newAV (); 1218 AV *av = newAV ();
1157 av_fill (av, BER_ARRAYSIZE - 1); 1219 av_fill (av, BER_ARRAYSIZE - 1);
1158 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1220 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1159 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1221 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1160 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1222 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1161 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1223 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1162 RETVAL = newRV_noinc ((SV *)av); 1224 RETVAL = newRV_noinc ((SV *)av);
1163} 1225}
1164 OUTPUT: RETVAL 1226 OUTPUT: RETVAL
1165 1227
1166MODULE = 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