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.13 by root, Sat Apr 20 13:46:14 2019 UTC vs.
Revision 1.25 by root, Sun Apr 21 10:40:30 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_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 },
227} 228}
228 229
229// get_* functions fetch something from the buffer 230// get_* functions fetch something from the buffer
230// decode_* functions use get_* fun ctions to decode ber values 231// decode_* functions use get_* fun ctions to decode ber values
231 232
233// get single octet
234static U8
235get_u8 (void)
236{
237 if (cur == end)
238 error ("unexpected end of message buffer");
239
240 return *cur++;
241}
242
232// get n octets 243// get n octets
233static U8 * 244static U8 *
234get_n (UV count) 245get_n (UV count)
235{ 246{
236 want (count); 247 want (count);
237 U8 *res = cur; 248 U8 *res = cur;
238 cur += count; 249 cur += count;
239 return res; 250 return res;
240} 251}
241 252
242// get single octet
243static U8
244get_u8 (void)
245{
246 if (cur == end)
247 error ("unexpected end of message buffer");
248
249 return *cur++;
250}
251
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 length 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 BER value lengths not supported");
282 return 0; 291
292 case 0x7f:
293 error ("BER 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 ("BER value length too long (must fit into UV)");
286 return 0;
287 297
298#if UVSIZE > 4
299 case 8: res = (res << 8) | get_u8 ();
300 case 7: res = (res << 8) | get_u8 ();
301 case 6: res = (res << 8) | get_u8 ();
302 case 5: res = (res << 8) | get_u8 ();
303#endif
288 case 4: res = (res << 8) | get_u8 (); 304 case 4: res = (res << 8) | get_u8 ();
289 case 3: res = (res << 8) | get_u8 (); 305 case 3: res = (res << 8) | get_u8 ();
290 case 2: res = (res << 8) | get_u8 (); 306 case 2: res = (res << 8) | get_u8 ();
291 case 1: res = (res << 8) | get_u8 (); 307 case 1: res = (res << 8) | get_u8 ();
292 } 308 }
294 310
295 return res; 311 return res;
296} 312}
297 313
298static SV * 314static SV *
299decode_int () 315decode_int (void)
300{ 316{
301 int len = get_length (); 317 UV len = get_length ();
302 318
303 if (len <= 0) 319 if (!len)
304 { 320 error ("invalid BER_TYPE_INT length zero (X.690 8.3.1)");
305 error ("integer length equal to zero");
306 return 0;
307 }
308 321
309 U8 *data = get_n (len); 322 U8 *data = get_n (len);
310 323
324 if (expect_false (len > 1))
325 {
326 U16 mask = (data [0] << 8) | data [1] & 0xff80;
327
328 if (expect_false (mask == 0xff80 || mask == 0x0000))
329 error ("illegal padding in BER_TYPE_INT (X.690 8.3.2)");
330 }
331
311 int negative = data [0] & 0x80; 332 int negative = data [0] & 0x80;
312 333
313 UV val = negative ? -1 : 0; // copy signbit to all bits 334 UV val = negative ? -1 : 0; // copy signbit to all bits
335
336 if (len > UVSIZE + (!negative && !*data))
337 error ("BER_TYPE_INT overflow");
314 338
315 do 339 do
316 val = (val << 8) | *data++; 340 val = (val << 8) | *data++;
317 while (--len); 341 while (--len);
318 342
322} 346}
323 347
324static SV * 348static SV *
325decode_data (void) 349decode_data (void)
326{ 350{
327 U32 len = get_length (); 351 UV len = get_length ();
328 U8 *data = get_n (len);
329 return newSVpvn ((char *)data, len); 352 return newSVpvn ((char *)get_n (len), len);
330} 353}
331 354
332// gelper for decode_object_identifier 355// helper for decode_object_identifier
333static char * 356static char *
334write_uv (char *buf, U32 u) 357write_uv (char *buf, UV u)
335{ 358{
336 // the one-digit case is absolutely predominant, so this pays off (hopefully) 359 // the one-digit case is absolutely predominant, so this pays off (hopefully)
337 if (expect_true (u < 10)) 360 if (expect_true (u < 10))
338 *buf++ = u + '0'; 361 *buf++ = u + '0';
339 else 362 else
340 { 363 {
341 // this *could* be done much faster using branchless fixed-ppint arithmetics 364 // this *could* be done much faster using branchless fixed-point arithmetics
342 char *beg = buf; 365 char *beg = buf;
343 366
344 do 367 do
345 { 368 {
346 *buf++ = u % 10 + '0'; 369 *buf++ = u % 10 + '0';
363} 386}
364 387
365static SV * 388static SV *
366decode_oid (int relative) 389decode_oid (int relative)
367{ 390{
368 U32 len = get_length (); 391 UV len = get_length ();
369 392
370 if (len <= 0) 393 if (len <= 0)
371 { 394 {
372 error ("OBJECT IDENTIFIER length equal to zero"); 395 error ("BER_TYPE_OID length must not be zero");
373 return &PL_sv_undef; 396 return &PL_sv_undef;
374 } 397 }
375 398
376 U8 *end = cur + len; 399 U8 *end = cur + len;
377 U32 w = get_w (); 400 UV w = get_w ();
378 401
379 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack 402 static char oid[MAX_OID_STRLEN]; // static, because too large for stack
380 char *app = oid; 403 char *app = oid;
381 404
382 if (relative) 405 if (relative)
383 app = write_uv (app, w); 406 app = write_uv (app, w);
384 else 407 else if (w < 2 * 40)
385 { 408 {
386 app = write_uv (app, (U8)w / 40); 409 app = write_uv (app, (U8)w / 40);
387 *app++ = '.'; 410 *app++ = '.';
388 app = write_uv (app, (U8)w % 40); 411 app = write_uv (app, (U8)w % 40);
389 } 412 }
413 else
414 {
415 app = write_uv (app, 2);
416 *app++ = '.';
417 app = write_uv (app, w - 2 * 40);
418 }
390 419
391 while (cur < end) 420 while (cur < end)
392 { 421 {
393 // we assume an oid component is never > 64 digits 422 // we assume an oid component is never > 64 digits
394 if (oid + sizeof (oid) - app < 64) 423 if (oid + sizeof (oid) - app < 64)
406static SV * 435static SV *
407decode_ucs (int chrsize) 436decode_ucs (int chrsize)
408{ 437{
409 SV *res = NEWSV (0, 0); 438 SV *res = NEWSV (0, 0);
410 439
411 U32 len = get_length (); 440 UV len = get_length ();
412 441
413 if (len & (chrsize - 1)) 442 if (len & (chrsize - 1))
414 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len); 443 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
415 444
416 while (len) 445 while (len)
437 466
438 return res; 467 return res;
439} 468}
440 469
441static SV * 470static SV *
442decode_ber () 471decode_ber (void)
443{ 472{
444 int identifier = get_u8 (); 473 int identifier = get_u8 ();
445 474
446 SV *res; 475 SV *res;
447 476
450 int tag = identifier & ASN_TAG_MASK; 479 int tag = identifier & ASN_TAG_MASK;
451 480
452 if (tag == ASN_TAG_BER) 481 if (tag == ASN_TAG_BER)
453 tag = get_w (); 482 tag = get_w ();
454 483
455 if (tag == ASN_TAG_BER)
456 tag = get_w ();
457
458 if (constructed) 484 if (constructed)
459 { 485 {
460 U32 len = get_length (); 486 UV len = get_length ();
461 U32 seqend = (cur - buf) + len; 487 UV seqend = (cur - buf) + len;
462 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 488 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
463 489
464 while (cur < buf + seqend) 490 while (cur < buf + seqend)
465 av_push (av, decode_ber ()); 491 av_push (av, decode_ber ());
466 492
467 if (cur > buf + seqend) 493 if (cur > buf + seqend)
468 croak ("constructed type %02x overflow (%x %x)\n", identifier, cur - buf, seqend); 494 croak ("CONSTRUCTED type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
469 495
470 res = newRV_inc ((SV *)av); 496 res = newRV_inc ((SV *)av);
471 } 497 }
472 else 498 else
473 switch (profile_lookup (cur_profile, klass, tag)) 499 switch (profile_lookup (cur_profile, klass, tag))
474 { 500 {
475 case BER_TYPE_NULL: 501 case BER_TYPE_NULL:
476 { 502 {
477 U32 len = get_length (); 503 UV len = get_length ();
478 504
479 if (len) 505 if (len)
480 croak ("BER_TYPE_NULL value with non-zero length %d encountered", len); 506 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
481 507
482 res = &PL_sv_undef; 508 res = &PL_sv_undef;
483 } 509 }
484 break; 510 break;
485 511
486 case BER_TYPE_BOOL: 512 case BER_TYPE_BOOL:
487 { 513 {
488 U32 len = get_length (); 514 UV len = get_length ();
489 515
490 if (len != 1) 516 if (len != 1)
491 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len); 517 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
492 518
493 res = newSVcacheint (!!get_u8 ()); 519 res = newSVcacheint (!!get_u8 ());
494 } 520 }
495 break; 521 break;
496 522
515 res = decode_data (); 541 res = decode_data ();
516 break; 542 break;
517 543
518 case BER_TYPE_IPADDRESS: 544 case BER_TYPE_IPADDRESS:
519 { 545 {
520 U32 len = get_length (); 546 UV len = get_length ();
521 547
522 if (len != 4) 548 if (len != 4)
523 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 549 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
524 550
525 U8 c1 = get_u8 (); 551 U8 c1 = get_u8 ();
526 U8 c2 = get_u8 (); 552 U8 c2 = get_u8 ();
527 U8 c3 = get_u8 (); 553 U8 c3 = get_u8 ();
528 U8 c4 = get_u8 (); 554 U8 c4 = get_u8 ();
538 case BER_TYPE_UCS4: 564 case BER_TYPE_UCS4:
539 res = decode_ucs (4); 565 res = decode_ucs (4);
540 break; 566 break;
541 567
542 case BER_TYPE_REAL: 568 case BER_TYPE_REAL:
569 error ("BER_TYPE_REAL not implemented");
570
543 case BER_TYPE_CROAK: 571 case BER_TYPE_CROAK:
572 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
573
544 default: 574 default:
545 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 575 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
546 } 576 }
547 577
548 AV *av = newAV (); 578 AV *av = newAV ();
549 av_fill (av, BER_ARRAYSIZE - 1); 579 av_fill (av, BER_ARRAYSIZE - 1);
550 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 580 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
551 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 581 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
552 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 582 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
553 AvARRAY (av)[BER_DATA ] = res; 583 AvARRAY (av)[BER_DATA ] = res;
554 584
555 return newRV_noinc ((SV *)av); 585 return newRV_noinc ((SV *)av);
556} 586}
557 587
558///////////////////////////////////////////////////////////////////////////// 588/////////////////////////////////////////////////////////////////////////////
563strlen_sum (STRLEN l1, STRLEN l2) 593strlen_sum (STRLEN l1, STRLEN l2)
564{ 594{
565 size_t sum = l1 + l2; 595 size_t sum = l1 + l2;
566 596
567 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 597 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
568 croak ("JSON::XS: string size overflow"); 598 croak ("Convert::BER::XS: string size overflow");
569 599
570 return sum; 600 return sum;
571} 601}
572 602
573static void 603static void
611 need (1); 641 need (1);
612 *cur++ = val; 642 *cur++ = val;
613} 643}
614 644
615static void 645static void
616put_w_nocheck (U32 val) 646put_w_nocheck (UV val)
617{ 647{
648#if UVSIZE > 4
649 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
650 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
651 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
652 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
653 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
654#endif
618 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 655 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
619 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 656 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
620 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 657 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
621 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 658 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
622 *cur = val & 0x7f; cur += 1; 659 *cur = val & 0x7f; cur += 1;
623} 660}
624 661
625static void 662static void
626put_w (U32 val) 663put_w (UV val)
627{ 664{
628 need (5); // we only handle up to 5 bytes 665 need (5); // we only handle up to 5 bytes
629 666
630 put_w_nocheck (val); 667 put_w_nocheck (val);
631} 668}
632 669
633static U8 * 670static U8 *
634put_length_at (U32 val, U8 *cur) 671put_length_at (UV val, U8 *cur)
635{ 672{
636 if (val < 0x7fU) 673 if (val < 0x7fU)
637 *cur++ = val; 674 *cur++ = val;
638 else 675 else
639 { 676 {
640 U8 *lenb = cur++; 677 U8 *lenb = cur++;
641 678
679#if UVSIZE > 4
680 *cur = val >> 56; cur += *cur > 0;
681 *cur = val >> 48; cur += *cur > 0;
682 *cur = val >> 40; cur += *cur > 0;
683 *cur = val >> 32; cur += *cur > 0;
684#endif
642 *cur = val >> 24; cur += *cur > 0; 685 *cur = val >> 24; cur += *cur > 0;
643 *cur = val >> 16; cur += *cur > 0; 686 *cur = val >> 16; cur += *cur > 0;
644 *cur = val >> 8; cur += *cur > 0; 687 *cur = val >> 8; cur += *cur > 0;
645 *cur = val ; cur += 1; 688 *cur = val ; cur += 1;
646 689
649 692
650 return cur; 693 return cur;
651} 694}
652 695
653static void 696static void
654put_length (U32 val) 697put_length (UV val)
655{ 698{
656 need (5 + val); 699 need (5 + val);
657 cur = put_length_at (val, cur); 700 cur = put_length_at (val, cur);
658} 701}
659 702
660// return how many bytes the encoded length requires 703// return how many bytes the encoded length requires
661static int length_length (U32 val) 704static int length_length (UV val)
662{ 705{
663 return val < 0x7fU 706 return val < 0x7fU
664 ? 1 707 ? 1
665 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 708 : 2
709 + (val > 0xffU)
710 + (val > 0xffffU)
711 + (val > 0xffffffU)
712#if UVSIZE > 4
713 + (val > 0xffffffffU)
714 + (val > 0xffffffffffU)
715 + (val > 0xffffffffffffU)
716 + (val > 0xffffffffffffffU)
717#endif
718 ;
666} 719}
667 720
668static void 721static void
669encode_data (const char *ptr, STRLEN len) 722encode_data (const char *ptr, STRLEN len)
670{ 723{
732 785
733 *lenb = cur - lenb - 1; 786 *lenb = cur - lenb - 1;
734} 787}
735 788
736// we don't know the length yet, so we optimistically 789// we don't know the length yet, so we optimistically
737// assume the length will need one octet later. if that 790// assume the length will need one octet later. If that
738// turns out to be wrong, we memove as needed. 791// turns out to be wrong, we memmove as needed.
739// mark the beginning 792// mark the beginning
740static STRLEN 793static STRLEN
741len_fixup_mark () 794len_fixup_mark (void)
742{ 795{
743 return cur++ - buf; 796 return cur++ - buf;
744} 797}
745 798
746// patch up the length 799// patch up the length
855{ 908{
856 AV *av = ber_tuple (tuple); 909 AV *av = ber_tuple (tuple);
857 910
858 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 911 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
859 int tag = SvIV (AvARRAY (av)[BER_TAG]); 912 int tag = SvIV (AvARRAY (av)[BER_TAG]);
860 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 913 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
861 SV *data = AvARRAY (av)[BER_DATA]; 914 SV *data = AvARRAY (av)[BER_DATA];
862 915
863 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 916 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
864 917
865 if (expect_false (tag >= ASN_TAG_BER)) 918 if (expect_false (tag >= ASN_TAG_BER))
876 // and adjust later 929 // and adjust later
877 need (1); 930 need (1);
878 STRLEN mark = len_fixup_mark (); 931 STRLEN mark = len_fixup_mark ();
879 932
880 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV)) 933 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV))
881 croak ("BER constructed data must be array-reference"); 934 croak ("BER CONSTRUCTED data must be array-reference");
882 935
883 AV *av = (AV *)SvRV (data); 936 AV *av = (AV *)SvRV (data);
884 int fill = AvFILL (av); 937 int fill = AvFILL (av);
885 938
886 if (expect_false (SvRMAGICAL (av))) 939 if (expect_false (SvRMAGICAL (av)))
887 croak ("BER constructed data must not be tied"); 940 croak ("BER CONSTRUCTED data must not be tied");
888 941
889 int i; 942 int i;
890 for (i = 0; i <= fill; ++i) 943 for (i = 0; i <= fill; ++i)
891 encode_ber (AvARRAY (av)[i]); 944 encode_ber (AvARRAY (av)[i]);
892 945
899 put_length (0); 952 put_length (0);
900 break; 953 break;
901 954
902 case BER_TYPE_BOOL: 955 case BER_TYPE_BOOL:
903 put_length (1); 956 put_length (1);
904 *cur++ = SvTRUE (data) ? 0xff : 0x00; 957 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
905 break; 958 break;
906 959
907 case BER_TYPE_OID: 960 case BER_TYPE_OID:
908 encode_oid (data, 0); 961 encode_oid (data, 0);
909 break; 962 break;
947 case BER_TYPE_UCS4: 1000 case BER_TYPE_UCS4:
948 encode_ucs (data, 4); 1001 encode_ucs (data, 4);
949 break; 1002 break;
950 1003
951 case BER_TYPE_REAL: 1004 case BER_TYPE_REAL:
1005 croak ("BER_TYPE_REAL not implemented");
1006
952 case BER_TYPE_CROAK: 1007 case BER_TYPE_CROAK:
1008 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
1009
953 default: 1010 default:
954 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 1011 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
955 } 1012 }
956 1013
957} 1014}
972 const char *name; 1029 const char *name;
973 IV iv; 1030 IV iv;
974 } *civ, const_iv[] = { 1031 } *civ, const_iv[] = {
975#define const_iv(name) { # name, name }, 1032#define const_iv(name) { # name, name },
976 const_iv (ASN_BOOLEAN) 1033 const_iv (ASN_BOOLEAN)
977 const_iv (ASN_INTEGER32) 1034 const_iv (ASN_INTEGER)
978 const_iv (ASN_BIT_STRING) 1035 const_iv (ASN_BIT_STRING)
979 const_iv (ASN_OCTET_STRING) 1036 const_iv (ASN_OCTET_STRING)
980 const_iv (ASN_NULL) 1037 const_iv (ASN_NULL)
981 const_iv (ASN_OBJECT_IDENTIFIER) 1038 const_iv (ASN_OBJECT_IDENTIFIER)
982 const_iv (ASN_OBJECT_DESCRIPTOR) 1039 const_iv (ASN_OBJECT_DESCRIPTOR)
1011 const_iv (ASN_CONTEXT) 1068 const_iv (ASN_CONTEXT)
1012 const_iv (ASN_PRIVATE) 1069 const_iv (ASN_PRIVATE)
1013 1070
1014 const_iv (BER_CLASS) 1071 const_iv (BER_CLASS)
1015 const_iv (BER_TAG) 1072 const_iv (BER_TAG)
1016 const_iv (BER_CONSTRUCTED) 1073 const_iv (BER_FLAGS)
1017 const_iv (BER_DATA) 1074 const_iv (BER_DATA)
1018 1075
1019 const_iv (BER_TYPE_BYTES) 1076 const_iv (BER_TYPE_BYTES)
1020 const_iv (BER_TYPE_UTF8) 1077 const_iv (BER_TYPE_UTF8)
1021 const_iv (BER_TYPE_UCS2) 1078 const_iv (BER_TYPE_UCS2)
1029 const_iv (BER_TYPE_IPADDRESS) 1086 const_iv (BER_TYPE_IPADDRESS)
1030 const_iv (BER_TYPE_CROAK) 1087 const_iv (BER_TYPE_CROAK)
1031 1088
1032 const_iv (SNMP_IPADDRESS) 1089 const_iv (SNMP_IPADDRESS)
1033 const_iv (SNMP_COUNTER32) 1090 const_iv (SNMP_COUNTER32)
1091 const_iv (SNMP_GAUGE32)
1034 const_iv (SNMP_UNSIGNED32) 1092 const_iv (SNMP_UNSIGNED32)
1035 const_iv (SNMP_TIMETICKS) 1093 const_iv (SNMP_TIMETICKS)
1036 const_iv (SNMP_OPAQUE) 1094 const_iv (SNMP_OPAQUE)
1037 const_iv (SNMP_COUNTER64) 1095 const_iv (SNMP_COUNTER64)
1038 }; 1096 };
1039 1097
1040 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) 1098 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)); 1099 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1042} 1100}
1043 1101
1044SV * 1102void
1045ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1103ber_decode (SV *ber, SV *profile = &PL_sv_undef)
1104 ALIAS:
1105 ber_decode_prefix = 1
1046 CODE: 1106 PPCODE:
1047{ 1107{
1048 cur_profile = SvPROFILE (profile); 1108 cur_profile = SvPROFILE (profile);
1049 STRLEN len; 1109 STRLEN len;
1050 buf = (U8 *)SvPVbyte (ber, len); 1110 buf = (U8 *)SvPVbyte (ber, len);
1051 cur = buf; 1111 cur = buf;
1052 end = buf + len; 1112 end = buf + len;
1053 1113
1054 RETVAL = decode_ber (); 1114 SV *tuple = decode_ber ();
1115
1116 EXTEND (SP, 2);
1117 PUSHs (sv_2mortal (tuple));
1118
1119 if (ix)
1120 PUSHs (sv_2mortal (newSViv (cur - buf)));
1121 else if (cur != end)
1122 error ("trailing garbage after BER value");
1055} 1123}
1056 OUTPUT: RETVAL
1057 1124
1058void 1125void
1059ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &PL_sv_undef, SV *data = &PL_sv_undef) 1126ber_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: 1127 PPCODE:
1061{ 1128{
1062 if (!SvOK (tuple)) 1129 if (!SvOK (tuple))
1063 XSRETURN_NO; 1130 XSRETURN_NO;
1064 1131
1066 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1133 croak ("ber_is: tuple must be BER tuple (array-ref)");
1067 1134
1068 AV *av = (AV *)SvRV (tuple); 1135 AV *av = (AV *)SvRV (tuple);
1069 1136
1070 XPUSHs ( 1137 XPUSHs (
1071 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1138 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1072 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1139 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1073 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1140 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1074 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1141 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1075 ? &PL_sv_yes : &PL_sv_undef); 1142 ? &PL_sv_yes : &PL_sv_undef);
1076} 1143}
1077 1144
1078void 1145void
1079ber_is_seq (SV *tuple) 1146ber_is_seq (SV *tuple)
1083 XSRETURN_UNDEF; 1150 XSRETURN_UNDEF;
1084 1151
1085 AV *av = ber_tuple (tuple); 1152 AV *av = ber_tuple (tuple);
1086 1153
1087 XPUSHs ( 1154 XPUSHs (
1088 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1155 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1089 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1156 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1090 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1157 && SvIV (AvARRAY (av)[BER_FLAGS])
1091 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1158 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1092} 1159}
1093 1160
1094void 1161void
1095ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1162ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1096 PPCODE: 1163 PPCODE:
1097{ 1164{
1098 if (!SvOK (tuple)) 1165 if (!SvOK (tuple))
1099 XSRETURN_NO; 1166 XSRETURN_NO;
1100 1167
1101 AV *av = ber_tuple (tuple); 1168 AV *av = ber_tuple (tuple);
1102 1169
1103 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1170 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1104 1171
1105 XPUSHs ( 1172 XPUSHs (
1106 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1173 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1107 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1174 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1108 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1175 && !SvIV (AvARRAY (av)[BER_FLAGS])
1109 && (!SvOK (value) || data == SvIV (value)) 1176 && (!SvOK (value) || data == SvUV (value))
1110 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1177 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1111 : &PL_sv_undef); 1178 : &PL_sv_undef);
1112} 1179}
1113 1180
1114void 1181void
1115ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1182ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
1119 XSRETURN_NO; 1186 XSRETURN_NO;
1120 1187
1121 AV *av = ber_tuple (tuple); 1188 AV *av = ber_tuple (tuple);
1122 1189
1123 XPUSHs ( 1190 XPUSHs (
1124 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1191 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1125 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1192 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1126 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1193 && !SvIV (AvARRAY (av)[BER_FLAGS])
1127 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1194 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1128 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1195 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1129} 1196}
1130 1197
1131############################################################################# 1198#############################################################################
1144 SvCUR_set (buf_sv, cur - buf); 1211 SvCUR_set (buf_sv, cur - buf);
1145 XPUSHs (buf_sv); 1212 XPUSHs (buf_sv);
1146} 1213}
1147 1214
1148SV * 1215SV *
1149ber_i32 (IV iv) 1216ber_int (SV *sv)
1150 CODE: 1217 CODE:
1151{ 1218{
1152 AV *av = newAV (); 1219 AV *av = newAV ();
1153 av_fill (av, BER_ARRAYSIZE - 1); 1220 av_fill (av, BER_ARRAYSIZE - 1);
1154 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1221 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1155 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1222 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1156 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1223 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1157 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1224 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1158 RETVAL = newRV_noinc ((SV *)av); 1225 RETVAL = newRV_noinc ((SV *)av);
1159} 1226}
1160 OUTPUT: RETVAL 1227 OUTPUT: RETVAL
1161 1228
1162# TODO: not arrayref, but elements? 1229# TODO: not arrayref, but elements?
1164ber_seq (SV *arrayref) 1231ber_seq (SV *arrayref)
1165 CODE: 1232 CODE:
1166{ 1233{
1167 AV *av = newAV (); 1234 AV *av = newAV ();
1168 av_fill (av, BER_ARRAYSIZE - 1); 1235 av_fill (av, BER_ARRAYSIZE - 1);
1169 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1236 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1170 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1237 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1171 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1238 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1172 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1239 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1173 RETVAL = newRV_noinc ((SV *)av); 1240 RETVAL = newRV_noinc ((SV *)av);
1174} 1241}
1175 OUTPUT: RETVAL 1242 OUTPUT: RETVAL
1176 1243
1177MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1244MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines