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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines