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.24 by root, Sun Apr 21 01:58:15 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 (); 265 if (expect_false (res >> UVSIZE * 8 - 7))
266 error ("BER variable integer overflow");
267
261 res = (res << 7) | (c & 0x7f); 268 res = (res << 7) | (c & 0x7f);
262 269
263 if (!(c & 0x80)) 270 if (!(c & 0x80))
264 return res; 271 return res;
265 }
266}
267 272
273 c = get_u8 ();
274 }
275}
276
268static U32 277static UV
269get_length (void) 278get_length (void)
270{ 279{
271 U32 res = get_u8 (); 280 UV res = get_u8 ();
272 281
273 if (res & 0x80) 282 if (res & 0x80)
274 { 283 {
275 int cnt = res & 0x7f; 284 int cnt = res & 0x7f;
276 res = 0; 285 res = 0;
277 286
278 switch (cnt) 287 switch (cnt)
279 { 288 {
280 case 0: 289 case 0:
281 error ("indefinite ASN.1 lengths not supported"); 290 error ("indefinite ASN.1 lengths not supported");
282 return 0; 291
292 case 0x7f:
293 error ("ASN.1 reserved value in length (X.690 8.1.3.5)");
283 294
284 default: 295 default:
285 error ("ASN.1 length too long"); 296 error ("ASN.1 length too long (only up to 2**64 octets supported)");
286 return 0;
287 297
298 case 8: res = (res << 8) | get_u8 ();
299 case 7: res = (res << 8) | get_u8 ();
300 case 6: res = (res << 8) | get_u8 ();
301 case 5: res = (res << 8) | get_u8 ();
288 case 4: res = (res << 8) | get_u8 (); 302 case 4: res = (res << 8) | get_u8 ();
289 case 3: res = (res << 8) | get_u8 (); 303 case 3: res = (res << 8) | get_u8 ();
290 case 2: res = (res << 8) | get_u8 (); 304 case 2: res = (res << 8) | get_u8 ();
291 case 1: res = (res << 8) | get_u8 (); 305 case 1: res = (res << 8) | get_u8 ();
292 } 306 }
294 308
295 return res; 309 return res;
296} 310}
297 311
298static SV * 312static SV *
299decode_int () 313decode_int (void)
300{ 314{
301 int len = get_length (); 315 UV len = get_length ();
302 316
303 if (len <= 0) 317 if (!len)
304 {
305 error ("integer length equal to zero"); 318 error ("invalid integer length equal to zero (X.690 8.3.1)");
306 return 0;
307 }
308 319
309 U8 *data = get_n (len); 320 U8 *data = get_n (len);
310 321
322 if (expect_false (len > 1))
323 {
324 U16 mask = (data [0] << 8) | data [1] & 0xff80;
325
326 if (expect_false (mask == 0xff80 || mask == 0x0000))
327 error ("illegal padding in integer (X.690 8.3.2)");
328 }
329
311 int negative = data [0] & 0x80; 330 int negative = data [0] & 0x80;
312 331
313 UV val = negative ? -1 : 0; // copy signbit to all bits 332 UV val = negative ? -1 : 0; // copy signbit to all bits
333
334 if (len > UVSIZE + (!negative && !*data))
335 error ("INTEGER overflow");
314 336
315 do 337 do
316 val = (val << 8) | *data++; 338 val = (val << 8) | *data++;
317 while (--len); 339 while (--len);
318 340
322} 344}
323 345
324static SV * 346static SV *
325decode_data (void) 347decode_data (void)
326{ 348{
327 U32 len = get_length (); 349 UV len = get_length ();
328 U8 *data = get_n (len);
329 return newSVpvn ((char *)data, len); 350 return newSVpvn ((char *)get_n (len), len);
330} 351}
331 352
332// gelper for decode_object_identifier 353// helper for decode_object_identifier
333static char * 354static char *
334write_uv (char *buf, U32 u) 355write_uv (char *buf, UV u)
335{ 356{
336 // the one-digit case is absolutely predominant, so this pays off (hopefully) 357 // the one-digit case is absolutely predominant, so this pays off (hopefully)
337 if (expect_true (u < 10)) 358 if (expect_true (u < 10))
338 *buf++ = u + '0'; 359 *buf++ = u + '0';
339 else 360 else
340 { 361 {
362 // this *could* be done much faster using branchless fixed-point arithmetics
341 char *beg = buf; 363 char *beg = buf;
342 364
343 do 365 do
344 { 366 {
345 *buf++ = u % 10 + '0'; 367 *buf++ = u % 10 + '0';
347 } 369 }
348 while (u); 370 while (u);
349 371
350 // reverse digits 372 // reverse digits
351 char *ptr = buf; 373 char *ptr = buf;
352 while (--ptr != beg) 374 while (--ptr > beg)
353 { 375 {
354 char c = *ptr; 376 char c = *ptr;
355 *ptr = *beg; 377 *ptr = *beg;
356 *beg = c; 378 *beg = c;
357 ++beg; 379 ++beg;
362} 384}
363 385
364static SV * 386static SV *
365decode_oid (int relative) 387decode_oid (int relative)
366{ 388{
367 U32 len = get_length (); 389 UV len = get_length ();
368 390
369 if (len <= 0) 391 if (len <= 0)
370 { 392 {
371 error ("OBJECT IDENTIFIER length equal to zero"); 393 error ("OBJECT IDENTIFIER length equal to zero");
372 return &PL_sv_undef; 394 return &PL_sv_undef;
373 } 395 }
374 396
375 U8 *end = cur + len; 397 U8 *end = cur + len;
376 U32 w = get_w (); 398 UV w = get_w ();
377 399
378 static char oid[MAX_OID_STRLEN]; // must be static 400 static char oid[MAX_OID_STRLEN]; // static, because too large for stack
379 char *app = oid; 401 char *app = oid;
380 402
381 if (relative) 403 if (relative)
382 app = write_uv (app, w); 404 app = write_uv (app, w);
383 else 405 else if (w < 2 * 40)
384 { 406 {
385 app = write_uv (app, (U8)w / 40); 407 app = write_uv (app, (U8)w / 40);
386 *app++ = '.'; 408 *app++ = '.';
387 app = write_uv (app, (U8)w % 40); 409 app = write_uv (app, (U8)w % 40);
388 } 410 }
411 else
412 {
413 app = write_uv (app, 2);
414 *app++ = '.';
415 app = write_uv (app, w - 2 * 40);
416 }
389 417
418 while (cur < end)
419 {
390 // we assume an oid component is never > 64 bytes 420 // we assume an oid component is never > 64 digits
391 while (cur < end && oid + sizeof (oid) - app > 64) 421 if (oid + sizeof (oid) - app < 64)
392 { 422 croak ("BER_TYPE_OID to long to decode");
423
393 w = get_w (); 424 w = get_w ();
394 *app++ = '.'; 425 *app++ = '.';
395 app = write_uv (app, w); 426 app = write_uv (app, w);
396 } 427 }
397 428
402static SV * 433static SV *
403decode_ucs (int chrsize) 434decode_ucs (int chrsize)
404{ 435{
405 SV *res = NEWSV (0, 0); 436 SV *res = NEWSV (0, 0);
406 437
407 U32 len = get_length (); 438 UV len = get_length ();
408 439
409 if (len & (chrsize - 1)) 440 if (len & (chrsize - 1))
410 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len); 441 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
411 442
412 while (len) 443 while (len)
433 464
434 return res; 465 return res;
435} 466}
436 467
437static SV * 468static SV *
438decode_ber () 469decode_ber (void)
439{ 470{
440 int identifier = get_u8 (); 471 int identifier = get_u8 ();
441 472
442 SV *res; 473 SV *res;
443 474
446 int tag = identifier & ASN_TAG_MASK; 477 int tag = identifier & ASN_TAG_MASK;
447 478
448 if (tag == ASN_TAG_BER) 479 if (tag == ASN_TAG_BER)
449 tag = get_w (); 480 tag = get_w ();
450 481
451 if (tag == ASN_TAG_BER)
452 tag = get_w ();
453
454 if (constructed) 482 if (constructed)
455 { 483 {
456 U32 len = get_length (); 484 UV len = get_length ();
457 U32 seqend = (cur - buf) + len; 485 UV seqend = (cur - buf) + len;
458 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 486 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
459 487
460 while (cur < buf + seqend) 488 while (cur < buf + seqend)
461 av_push (av, decode_ber ()); 489 av_push (av, decode_ber ());
462 490
463 if (cur > buf + seqend) 491 if (cur > buf + seqend)
464 croak ("constructed type %02x overflow (%x %x)\n", identifier, cur - buf, seqend); 492 croak ("constructed type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
465 493
466 res = newRV_inc ((SV *)av); 494 res = newRV_inc ((SV *)av);
467 } 495 }
468 else 496 else
469 switch (profile_lookup (cur_profile, klass, tag)) 497 switch (profile_lookup (cur_profile, klass, tag))
470 { 498 {
471 case BER_TYPE_NULL: 499 case BER_TYPE_NULL:
500 {
501 UV len = get_length ();
502
503 if (len)
504 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
505
472 res = &PL_sv_undef; 506 res = &PL_sv_undef;
507 }
473 break; 508 break;
474 509
475 case BER_TYPE_BOOL: 510 case BER_TYPE_BOOL:
476 { 511 {
477 U32 len = get_length (); 512 UV len = get_length ();
478 513
479 if (len != 1) 514 if (len != 1)
480 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len); 515 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
481 516
482 res = newSVcacheint (get_u8 () ? 0 : 1); 517 res = newSVcacheint (!!get_u8 ());
483 } 518 }
484 break; 519 break;
485 520
486 case BER_TYPE_OID: 521 case BER_TYPE_OID:
487 res = decode_oid (0); 522 res = decode_oid (0);
504 res = decode_data (); 539 res = decode_data ();
505 break; 540 break;
506 541
507 case BER_TYPE_IPADDRESS: 542 case BER_TYPE_IPADDRESS:
508 { 543 {
509 U32 len = get_length (); 544 UV len = get_length ();
510 545
511 if (len != 4) 546 if (len != 4)
512 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 547 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
513 548
514 U8 c1 = get_u8 (); 549 U8 c1 = get_u8 ();
515 U8 c2 = get_u8 (); 550 U8 c2 = get_u8 ();
516 U8 c3 = get_u8 (); 551 U8 c3 = get_u8 ();
517 U8 c4 = get_u8 (); 552 U8 c4 = get_u8 ();
534 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 569 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
535 } 570 }
536 571
537 AV *av = newAV (); 572 AV *av = newAV ();
538 av_fill (av, BER_ARRAYSIZE - 1); 573 av_fill (av, BER_ARRAYSIZE - 1);
539 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 574 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
540 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 575 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
541 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 576 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
542 AvARRAY (av)[BER_DATA ] = res; 577 AvARRAY (av)[BER_DATA ] = res;
543 578
544 return newRV_noinc ((SV *)av); 579 return newRV_noinc ((SV *)av);
545} 580}
546 581
547///////////////////////////////////////////////////////////////////////////// 582/////////////////////////////////////////////////////////////////////////////
552strlen_sum (STRLEN l1, STRLEN l2) 587strlen_sum (STRLEN l1, STRLEN l2)
553{ 588{
554 size_t sum = l1 + l2; 589 size_t sum = l1 + l2;
555 590
556 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 591 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
557 croak ("JSON::XS: string size overflow"); 592 croak ("Convert::BER::XS: string size overflow");
558 593
559 return sum; 594 return sum;
560} 595}
561 596
562static void 597static void
600 need (1); 635 need (1);
601 *cur++ = val; 636 *cur++ = val;
602} 637}
603 638
604static void 639static void
605put_w_nocheck (U32 val) 640put_w_nocheck (UV val)
606{ 641{
642#if UVSIZE > 4
643 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
644 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
645 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
646 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
647 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
648#endif
607 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 649 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
608 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 650 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
609 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 651 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
610 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 652 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
611 *cur = val & 0x7f; cur += 1; 653 *cur = val & 0x7f; cur += 1;
612} 654}
613 655
614static void 656static void
615put_w (U32 val) 657put_w (UV val)
616{ 658{
617 need (5); // we only handle up to 5 bytes 659 need (5); // we only handle up to 5 bytes
618 660
619 put_w_nocheck (val); 661 put_w_nocheck (val);
620} 662}
621 663
622static U8 * 664static U8 *
623put_length_at (U32 val, U8 *cur) 665put_length_at (UV val, U8 *cur)
624{ 666{
625 if (val < 0x7fU) 667 if (val < 0x7fU)
626 *cur++ = val; 668 *cur++ = val;
627 else 669 else
628 { 670 {
629 U8 *lenb = cur++; 671 U8 *lenb = cur++;
630 672
673#if UVSIZE > 4
674 *cur = val >> 56; cur += *cur > 0;
675 *cur = val >> 48; cur += *cur > 0;
676 *cur = val >> 40; cur += *cur > 0;
677 *cur = val >> 32; cur += *cur > 0;
678#endif
631 *cur = val >> 24; cur += *cur > 0; 679 *cur = val >> 24; cur += *cur > 0;
632 *cur = val >> 16; cur += *cur > 0; 680 *cur = val >> 16; cur += *cur > 0;
633 *cur = val >> 8; cur += *cur > 0; 681 *cur = val >> 8; cur += *cur > 0;
634 *cur = val ; cur += 1; 682 *cur = val ; cur += 1;
635 683
638 686
639 return cur; 687 return cur;
640} 688}
641 689
642static void 690static void
643put_length (U32 val) 691put_length (UV val)
644{ 692{
645 need (5 + val); 693 need (5 + val);
646 cur = put_length_at (val, cur); 694 cur = put_length_at (val, cur);
647} 695}
648 696
649// return how many bytes the encoded length requires 697// return how many bytes the encoded length requires
650static int length_length (U32 val) 698static int length_length (UV val)
651{ 699{
652 return val < 0x7fU 700 return val < 0x7fU
653 ? 1 701 ? 1
654 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 702 : 2
703 + (val > 0xffU)
704 + (val > 0xffffU)
705 + (val > 0xffffffU)
706#if UVSIZE > 4
707 + (val > 0xffffffffU)
708 + (val > 0xffffffffffU)
709 + (val > 0xffffffffffffU)
710 + (val > 0xffffffffffffffU)
711#endif
712 ;
655} 713}
656 714
657static void 715static void
658encode_data (const char *ptr, STRLEN len) 716encode_data (const char *ptr, STRLEN len)
659{ 717{
721 779
722 *lenb = cur - lenb - 1; 780 *lenb = cur - lenb - 1;
723} 781}
724 782
725// we don't know the length yet, so we optimistically 783// we don't know the length yet, so we optimistically
726// assume the length will need one octet later. if that 784// assume the length will need one octet later. If that
727// turns out to be wrong, we memove as needed. 785// turns out to be wrong, we memmove as needed.
728// mark the beginning 786// mark the beginning
729static STRLEN 787static STRLEN
730len_fixup_mark () 788len_fixup_mark (void)
731{ 789{
732 return cur++ - buf; 790 return cur++ - buf;
733} 791}
734 792
735// patch up the length 793// patch up the length
844{ 902{
845 AV *av = ber_tuple (tuple); 903 AV *av = ber_tuple (tuple);
846 904
847 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 905 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
848 int tag = SvIV (AvARRAY (av)[BER_TAG]); 906 int tag = SvIV (AvARRAY (av)[BER_TAG]);
849 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 907 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
850 SV *data = AvARRAY (av)[BER_DATA]; 908 SV *data = AvARRAY (av)[BER_DATA];
851 909
852 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 910 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
853 911
854 if (expect_false (tag >= ASN_TAG_BER)) 912 if (expect_false (tag >= ASN_TAG_BER))
888 put_length (0); 946 put_length (0);
889 break; 947 break;
890 948
891 case BER_TYPE_BOOL: 949 case BER_TYPE_BOOL:
892 put_length (1); 950 put_length (1);
893 *cur++ = SvTRUE (data) ? 0xff : 0x00; 951 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
894 break; 952 break;
895 953
896 case BER_TYPE_OID: 954 case BER_TYPE_OID:
897 encode_oid (data, 0); 955 encode_oid (data, 0);
898 break; 956 break;
961 const char *name; 1019 const char *name;
962 IV iv; 1020 IV iv;
963 } *civ, const_iv[] = { 1021 } *civ, const_iv[] = {
964#define const_iv(name) { # name, name }, 1022#define const_iv(name) { # name, name },
965 const_iv (ASN_BOOLEAN) 1023 const_iv (ASN_BOOLEAN)
966 const_iv (ASN_INTEGER32) 1024 const_iv (ASN_INTEGER)
967 const_iv (ASN_BIT_STRING) 1025 const_iv (ASN_BIT_STRING)
968 const_iv (ASN_OCTET_STRING) 1026 const_iv (ASN_OCTET_STRING)
969 const_iv (ASN_NULL) 1027 const_iv (ASN_NULL)
970 const_iv (ASN_OBJECT_IDENTIFIER) 1028 const_iv (ASN_OBJECT_IDENTIFIER)
971 const_iv (ASN_OBJECT_DESCRIPTOR) 1029 const_iv (ASN_OBJECT_DESCRIPTOR)
1000 const_iv (ASN_CONTEXT) 1058 const_iv (ASN_CONTEXT)
1001 const_iv (ASN_PRIVATE) 1059 const_iv (ASN_PRIVATE)
1002 1060
1003 const_iv (BER_CLASS) 1061 const_iv (BER_CLASS)
1004 const_iv (BER_TAG) 1062 const_iv (BER_TAG)
1005 const_iv (BER_CONSTRUCTED) 1063 const_iv (BER_FLAGS)
1006 const_iv (BER_DATA) 1064 const_iv (BER_DATA)
1007 1065
1008 const_iv (BER_TYPE_BYTES) 1066 const_iv (BER_TYPE_BYTES)
1009 const_iv (BER_TYPE_UTF8) 1067 const_iv (BER_TYPE_UTF8)
1010 const_iv (BER_TYPE_UCS2) 1068 const_iv (BER_TYPE_UCS2)
1018 const_iv (BER_TYPE_IPADDRESS) 1076 const_iv (BER_TYPE_IPADDRESS)
1019 const_iv (BER_TYPE_CROAK) 1077 const_iv (BER_TYPE_CROAK)
1020 1078
1021 const_iv (SNMP_IPADDRESS) 1079 const_iv (SNMP_IPADDRESS)
1022 const_iv (SNMP_COUNTER32) 1080 const_iv (SNMP_COUNTER32)
1081 const_iv (SNMP_GAUGE32)
1023 const_iv (SNMP_UNSIGNED32) 1082 const_iv (SNMP_UNSIGNED32)
1024 const_iv (SNMP_TIMETICKS) 1083 const_iv (SNMP_TIMETICKS)
1025 const_iv (SNMP_OPAQUE) 1084 const_iv (SNMP_OPAQUE)
1026 const_iv (SNMP_COUNTER64) 1085 const_iv (SNMP_COUNTER64)
1027 }; 1086 };
1028 1087
1029 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) 1088 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)); 1089 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1031} 1090}
1032 1091
1033SV * 1092void
1034ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1093ber_decode (SV *ber, SV *profile = &PL_sv_undef)
1094 ALIAS:
1095 ber_decode_prefix = 1
1035 CODE: 1096 PPCODE:
1036{ 1097{
1037 cur_profile = SvPROFILE (profile); 1098 cur_profile = SvPROFILE (profile);
1038 STRLEN len; 1099 STRLEN len;
1039 buf = (U8 *)SvPVbyte (ber, len); 1100 buf = (U8 *)SvPVbyte (ber, len);
1040 cur = buf; 1101 cur = buf;
1041 end = buf + len; 1102 end = buf + len;
1042 1103
1043 RETVAL = decode_ber (); 1104 SV *tuple = decode_ber ();
1105
1106 EXTEND (SP, 2);
1107 PUSHs (sv_2mortal (tuple));
1108
1109 if (ix)
1110 PUSHs (sv_2mortal (newSViv (cur - buf)));
1111 else if (cur != end)
1112 error ("trailing garbage after BER data");
1044} 1113}
1045 OUTPUT: RETVAL
1046 1114
1047void 1115void
1048ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &PL_sv_undef, SV *data = &PL_sv_undef) 1116ber_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: 1117 PPCODE:
1050{ 1118{
1051 if (!SvOK (tuple)) 1119 if (!SvOK (tuple))
1052 XSRETURN_NO; 1120 XSRETURN_NO;
1053 1121
1055 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1123 croak ("ber_is: tuple must be BER tuple (array-ref)");
1056 1124
1057 AV *av = (AV *)SvRV (tuple); 1125 AV *av = (AV *)SvRV (tuple);
1058 1126
1059 XPUSHs ( 1127 XPUSHs (
1060 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1128 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1061 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1129 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1062 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1130 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1063 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1131 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1064 ? &PL_sv_yes : &PL_sv_undef); 1132 ? &PL_sv_yes : &PL_sv_undef);
1065} 1133}
1066 1134
1067void 1135void
1068ber_is_seq (SV *tuple) 1136ber_is_seq (SV *tuple)
1072 XSRETURN_UNDEF; 1140 XSRETURN_UNDEF;
1073 1141
1074 AV *av = ber_tuple (tuple); 1142 AV *av = ber_tuple (tuple);
1075 1143
1076 XPUSHs ( 1144 XPUSHs (
1077 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1145 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1078 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1146 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1079 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1147 && SvIV (AvARRAY (av)[BER_FLAGS])
1080 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1148 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1081} 1149}
1082 1150
1083void 1151void
1084ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1152ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1085 PPCODE: 1153 PPCODE:
1086{ 1154{
1087 if (!SvOK (tuple)) 1155 if (!SvOK (tuple))
1088 XSRETURN_NO; 1156 XSRETURN_NO;
1089 1157
1090 AV *av = ber_tuple (tuple); 1158 AV *av = ber_tuple (tuple);
1091 1159
1092 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1160 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1093 1161
1094 XPUSHs ( 1162 XPUSHs (
1095 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1163 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1096 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1164 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1097 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1165 && !SvIV (AvARRAY (av)[BER_FLAGS])
1098 && (!SvOK (value) || data == SvIV (value)) 1166 && (!SvOK (value) || data == SvUV (value))
1099 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1167 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1100 : &PL_sv_undef); 1168 : &PL_sv_undef);
1101} 1169}
1102 1170
1103void 1171void
1104ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1172ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
1108 XSRETURN_NO; 1176 XSRETURN_NO;
1109 1177
1110 AV *av = ber_tuple (tuple); 1178 AV *av = ber_tuple (tuple);
1111 1179
1112 XPUSHs ( 1180 XPUSHs (
1113 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1181 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1114 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1182 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1115 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1183 && !SvIV (AvARRAY (av)[BER_FLAGS])
1116 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1184 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1117 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1185 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1118} 1186}
1119 1187
1120############################################################################# 1188#############################################################################
1133 SvCUR_set (buf_sv, cur - buf); 1201 SvCUR_set (buf_sv, cur - buf);
1134 XPUSHs (buf_sv); 1202 XPUSHs (buf_sv);
1135} 1203}
1136 1204
1137SV * 1205SV *
1138ber_i32 (IV iv) 1206ber_int (SV *sv)
1139 CODE: 1207 CODE:
1140{ 1208{
1141 AV *av = newAV (); 1209 AV *av = newAV ();
1142 av_fill (av, BER_ARRAYSIZE - 1); 1210 av_fill (av, BER_ARRAYSIZE - 1);
1143 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1211 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1144 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1212 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1145 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1213 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1146 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1214 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1147 RETVAL = newRV_noinc ((SV *)av); 1215 RETVAL = newRV_noinc ((SV *)av);
1148} 1216}
1149 OUTPUT: RETVAL 1217 OUTPUT: RETVAL
1150 1218
1151# TODO: not arrayref, but elements? 1219# TODO: not arrayref, but elements?
1153ber_seq (SV *arrayref) 1221ber_seq (SV *arrayref)
1154 CODE: 1222 CODE:
1155{ 1223{
1156 AV *av = newAV (); 1224 AV *av = newAV ();
1157 av_fill (av, BER_ARRAYSIZE - 1); 1225 av_fill (av, BER_ARRAYSIZE - 1);
1158 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1226 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1159 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1227 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1160 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1228 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1161 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1229 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1162 RETVAL = newRV_noinc ((SV *)av); 1230 RETVAL = newRV_noinc ((SV *)av);
1163} 1231}
1164 OUTPUT: RETVAL 1232 OUTPUT: RETVAL
1165 1233
1166MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1234MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines