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.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_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
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 {
364 // this *could* be done much faster using branchless fixed-point arithmetics
341 char *beg = buf; 365 char *beg = buf;
342 366
343 do 367 do
344 { 368 {
345 *buf++ = u % 10 + '0'; 369 *buf++ = u % 10 + '0';
347 } 371 }
348 while (u); 372 while (u);
349 373
350 // reverse digits 374 // reverse digits
351 char *ptr = buf; 375 char *ptr = buf;
352 while (--ptr != beg) 376 while (--ptr > beg)
353 { 377 {
354 char c = *ptr; 378 char c = *ptr;
355 *ptr = *beg; 379 *ptr = *beg;
356 *beg = c; 380 *beg = c;
357 ++beg; 381 ++beg;
362} 386}
363 387
364static SV * 388static SV *
365decode_oid (int relative) 389decode_oid (int relative)
366{ 390{
367 U32 len = get_length (); 391 UV len = get_length ();
368 392
369 if (len <= 0) 393 if (len <= 0)
370 { 394 {
371 error ("OBJECT IDENTIFIER length equal to zero"); 395 error ("BER_TYPE_OID length must not be zero");
372 return &PL_sv_undef; 396 return &PL_sv_undef;
373 } 397 }
374 398
375 U8 *end = cur + len; 399 U8 *end = cur + len;
376 U32 w = get_w (); 400 UV w = get_w ();
377 401
378 static char oid[MAX_OID_STRLEN]; // must be static 402 static char oid[MAX_OID_STRLEN]; // static, because too large for stack
379 char *app = oid; 403 char *app = oid;
380 404
381 if (relative) 405 if (relative)
382 app = write_uv (app, w); 406 app = write_uv (app, w);
383 else 407 else if (w < 2 * 40)
384 { 408 {
385 app = write_uv (app, (U8)w / 40); 409 app = write_uv (app, (U8)w / 40);
386 *app++ = '.'; 410 *app++ = '.';
387 app = write_uv (app, (U8)w % 40); 411 app = write_uv (app, (U8)w % 40);
388 } 412 }
413 else
414 {
415 app = write_uv (app, 2);
416 *app++ = '.';
417 app = write_uv (app, w - 2 * 40);
418 }
389 419
420 while (cur < end)
421 {
390 // we assume an oid component is never > 64 bytes 422 // we assume an oid component is never > 64 digits
391 while (cur < end && oid + sizeof (oid) - app > 64) 423 if (oid + sizeof (oid) - app < 64)
392 { 424 croak ("BER_TYPE_OID to long to decode");
425
393 w = get_w (); 426 w = get_w ();
394 *app++ = '.'; 427 *app++ = '.';
395 app = write_uv (app, w); 428 app = write_uv (app, w);
396 } 429 }
397 430
402static SV * 435static SV *
403decode_ucs (int chrsize) 436decode_ucs (int chrsize)
404{ 437{
405 SV *res = NEWSV (0, 0); 438 SV *res = NEWSV (0, 0);
406 439
407 U32 len = get_length (); 440 UV len = get_length ();
408 441
409 if (len & (chrsize - 1)) 442 if (len & (chrsize - 1))
410 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);
411 444
412 while (len) 445 while (len)
433 466
434 return res; 467 return res;
435} 468}
436 469
437static SV * 470static SV *
438decode_ber () 471decode_ber (void)
439{ 472{
440 int identifier = get_u8 (); 473 int identifier = get_u8 ();
441 474
442 SV *res; 475 SV *res;
443 476
446 int tag = identifier & ASN_TAG_MASK; 479 int tag = identifier & ASN_TAG_MASK;
447 480
448 if (tag == ASN_TAG_BER) 481 if (tag == ASN_TAG_BER)
449 tag = get_w (); 482 tag = get_w ();
450 483
451 if (tag == ASN_TAG_BER)
452 tag = get_w ();
453
454 if (constructed) 484 if (constructed)
455 { 485 {
456 U32 len = get_length (); 486 UV len = get_length ();
457 U32 seqend = (cur - buf) + len; 487 UV seqend = (cur - buf) + len;
458 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 488 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
459 489
460 while (cur < buf + seqend) 490 while (cur < buf + seqend)
461 av_push (av, decode_ber ()); 491 av_push (av, decode_ber ());
462 492
463 if (cur > buf + seqend) 493 if (cur > buf + seqend)
464 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);
465 495
466 res = newRV_inc ((SV *)av); 496 res = newRV_inc ((SV *)av);
467 } 497 }
468 else 498 else
469 switch (profile_lookup (cur_profile, klass, tag)) 499 switch (profile_lookup (cur_profile, klass, tag))
470 { 500 {
471 case BER_TYPE_NULL: 501 case BER_TYPE_NULL:
502 {
503 UV len = get_length ();
504
505 if (len)
506 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
507
472 res = &PL_sv_undef; 508 res = &PL_sv_undef;
509 }
473 break; 510 break;
474 511
475 case BER_TYPE_BOOL: 512 case BER_TYPE_BOOL:
476 { 513 {
477 U32 len = get_length (); 514 UV len = get_length ();
478 515
479 if (len != 1) 516 if (len != 1)
480 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len); 517 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
481 518
482 res = newSVcacheint (get_u8 () ? 0 : 1); 519 res = newSVcacheint (!!get_u8 ());
483 } 520 }
484 break; 521 break;
485 522
486 case BER_TYPE_OID: 523 case BER_TYPE_OID:
487 res = decode_oid (0); 524 res = decode_oid (0);
504 res = decode_data (); 541 res = decode_data ();
505 break; 542 break;
506 543
507 case BER_TYPE_IPADDRESS: 544 case BER_TYPE_IPADDRESS:
508 { 545 {
509 U32 len = get_length (); 546 UV len = get_length ();
510 547
511 if (len != 4) 548 if (len != 4)
512 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);
513 550
514 U8 c1 = get_u8 (); 551 U8 c1 = get_u8 ();
515 U8 c2 = get_u8 (); 552 U8 c2 = get_u8 ();
516 U8 c3 = get_u8 (); 553 U8 c3 = get_u8 ();
517 U8 c4 = get_u8 (); 554 U8 c4 = get_u8 ();
527 case BER_TYPE_UCS4: 564 case BER_TYPE_UCS4:
528 res = decode_ucs (4); 565 res = decode_ucs (4);
529 break; 566 break;
530 567
531 case BER_TYPE_REAL: 568 case BER_TYPE_REAL:
569 error ("BER_TYPE_REAL not implemented");
570
532 case BER_TYPE_CROAK: 571 case BER_TYPE_CROAK:
572 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
573
533 default: 574 default:
534 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 575 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
535 } 576 }
536 577
537 AV *av = newAV (); 578 AV *av = newAV ();
538 av_fill (av, BER_ARRAYSIZE - 1); 579 av_fill (av, BER_ARRAYSIZE - 1);
539 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 580 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
540 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 581 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
541 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 582 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
542 AvARRAY (av)[BER_DATA ] = res; 583 AvARRAY (av)[BER_DATA ] = res;
543 584
544 return newRV_noinc ((SV *)av); 585 return newRV_noinc ((SV *)av);
545} 586}
546 587
547///////////////////////////////////////////////////////////////////////////// 588/////////////////////////////////////////////////////////////////////////////
552strlen_sum (STRLEN l1, STRLEN l2) 593strlen_sum (STRLEN l1, STRLEN l2)
553{ 594{
554 size_t sum = l1 + l2; 595 size_t sum = l1 + l2;
555 596
556 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 597 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
557 croak ("JSON::XS: string size overflow"); 598 croak ("Convert::BER::XS: string size overflow");
558 599
559 return sum; 600 return sum;
560} 601}
561 602
562static void 603static void
600 need (1); 641 need (1);
601 *cur++ = val; 642 *cur++ = val;
602} 643}
603 644
604static void 645static void
605put_w_nocheck (U32 val) 646put_w_nocheck (UV val)
606{ 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
607 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 655 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
608 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 656 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
609 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 657 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
610 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 658 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
611 *cur = val & 0x7f; cur += 1; 659 *cur = val & 0x7f; cur += 1;
612} 660}
613 661
614static void 662static void
615put_w (U32 val) 663put_w (UV val)
616{ 664{
617 need (5); // we only handle up to 5 bytes 665 need (5); // we only handle up to 5 bytes
618 666
619 put_w_nocheck (val); 667 put_w_nocheck (val);
620} 668}
621 669
622static U8 * 670static U8 *
623put_length_at (U32 val, U8 *cur) 671put_length_at (UV val, U8 *cur)
624{ 672{
625 if (val < 0x7fU) 673 if (val < 0x7fU)
626 *cur++ = val; 674 *cur++ = val;
627 else 675 else
628 { 676 {
629 U8 *lenb = cur++; 677 U8 *lenb = cur++;
630 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
631 *cur = val >> 24; cur += *cur > 0; 685 *cur = val >> 24; cur += *cur > 0;
632 *cur = val >> 16; cur += *cur > 0; 686 *cur = val >> 16; cur += *cur > 0;
633 *cur = val >> 8; cur += *cur > 0; 687 *cur = val >> 8; cur += *cur > 0;
634 *cur = val ; cur += 1; 688 *cur = val ; cur += 1;
635 689
638 692
639 return cur; 693 return cur;
640} 694}
641 695
642static void 696static void
643put_length (U32 val) 697put_length (UV val)
644{ 698{
645 need (5 + val); 699 need (5 + val);
646 cur = put_length_at (val, cur); 700 cur = put_length_at (val, cur);
647} 701}
648 702
649// return how many bytes the encoded length requires 703// return how many bytes the encoded length requires
650static int length_length (U32 val) 704static int length_length (UV val)
651{ 705{
652 return val < 0x7fU 706 return val < 0x7fU
653 ? 1 707 ? 1
654 : 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 ;
655} 719}
656 720
657static void 721static void
658encode_data (const char *ptr, STRLEN len) 722encode_data (const char *ptr, STRLEN len)
659{ 723{
721 785
722 *lenb = cur - lenb - 1; 786 *lenb = cur - lenb - 1;
723} 787}
724 788
725// we don't know the length yet, so we optimistically 789// we don't know the length yet, so we optimistically
726// assume the length will need one octet later. if that 790// assume the length will need one octet later. If that
727// turns out to be wrong, we memove as needed. 791// turns out to be wrong, we memmove as needed.
728// mark the beginning 792// mark the beginning
729static STRLEN 793static STRLEN
730len_fixup_mark () 794len_fixup_mark (void)
731{ 795{
732 return cur++ - buf; 796 return cur++ - buf;
733} 797}
734 798
735// patch up the length 799// patch up the length
844{ 908{
845 AV *av = ber_tuple (tuple); 909 AV *av = ber_tuple (tuple);
846 910
847 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 911 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
848 int tag = SvIV (AvARRAY (av)[BER_TAG]); 912 int tag = SvIV (AvARRAY (av)[BER_TAG]);
849 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 913 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
850 SV *data = AvARRAY (av)[BER_DATA]; 914 SV *data = AvARRAY (av)[BER_DATA];
851 915
852 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 916 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
853 917
854 if (expect_false (tag >= ASN_TAG_BER)) 918 if (expect_false (tag >= ASN_TAG_BER))
865 // and adjust later 929 // and adjust later
866 need (1); 930 need (1);
867 STRLEN mark = len_fixup_mark (); 931 STRLEN mark = len_fixup_mark ();
868 932
869 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV)) 933 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV))
870 croak ("BER constructed data must be array-reference"); 934 croak ("BER CONSTRUCTED data must be array-reference");
871 935
872 AV *av = (AV *)SvRV (data); 936 AV *av = (AV *)SvRV (data);
873 int fill = AvFILL (av); 937 int fill = AvFILL (av);
874 938
875 if (expect_false (SvRMAGICAL (av))) 939 if (expect_false (SvRMAGICAL (av)))
876 croak ("BER constructed data must not be tied"); 940 croak ("BER CONSTRUCTED data must not be tied");
877 941
878 int i; 942 int i;
879 for (i = 0; i <= fill; ++i) 943 for (i = 0; i <= fill; ++i)
880 encode_ber (AvARRAY (av)[i]); 944 encode_ber (AvARRAY (av)[i]);
881 945
888 put_length (0); 952 put_length (0);
889 break; 953 break;
890 954
891 case BER_TYPE_BOOL: 955 case BER_TYPE_BOOL:
892 put_length (1); 956 put_length (1);
893 *cur++ = SvTRUE (data) ? 0xff : 0x00; 957 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
894 break; 958 break;
895 959
896 case BER_TYPE_OID: 960 case BER_TYPE_OID:
897 encode_oid (data, 0); 961 encode_oid (data, 0);
898 break; 962 break;
936 case BER_TYPE_UCS4: 1000 case BER_TYPE_UCS4:
937 encode_ucs (data, 4); 1001 encode_ucs (data, 4);
938 break; 1002 break;
939 1003
940 case BER_TYPE_REAL: 1004 case BER_TYPE_REAL:
1005 croak ("BER_TYPE_REAL not implemented");
1006
941 case BER_TYPE_CROAK: 1007 case BER_TYPE_CROAK:
1008 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
1009
942 default: 1010 default:
943 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 1011 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
944 } 1012 }
945 1013
946} 1014}
961 const char *name; 1029 const char *name;
962 IV iv; 1030 IV iv;
963 } *civ, const_iv[] = { 1031 } *civ, const_iv[] = {
964#define const_iv(name) { # name, name }, 1032#define const_iv(name) { # name, name },
965 const_iv (ASN_BOOLEAN) 1033 const_iv (ASN_BOOLEAN)
966 const_iv (ASN_INTEGER32) 1034 const_iv (ASN_INTEGER)
967 const_iv (ASN_BIT_STRING) 1035 const_iv (ASN_BIT_STRING)
968 const_iv (ASN_OCTET_STRING) 1036 const_iv (ASN_OCTET_STRING)
969 const_iv (ASN_NULL) 1037 const_iv (ASN_NULL)
970 const_iv (ASN_OBJECT_IDENTIFIER) 1038 const_iv (ASN_OBJECT_IDENTIFIER)
971 const_iv (ASN_OBJECT_DESCRIPTOR) 1039 const_iv (ASN_OBJECT_DESCRIPTOR)
1000 const_iv (ASN_CONTEXT) 1068 const_iv (ASN_CONTEXT)
1001 const_iv (ASN_PRIVATE) 1069 const_iv (ASN_PRIVATE)
1002 1070
1003 const_iv (BER_CLASS) 1071 const_iv (BER_CLASS)
1004 const_iv (BER_TAG) 1072 const_iv (BER_TAG)
1005 const_iv (BER_CONSTRUCTED) 1073 const_iv (BER_FLAGS)
1006 const_iv (BER_DATA) 1074 const_iv (BER_DATA)
1007 1075
1008 const_iv (BER_TYPE_BYTES) 1076 const_iv (BER_TYPE_BYTES)
1009 const_iv (BER_TYPE_UTF8) 1077 const_iv (BER_TYPE_UTF8)
1010 const_iv (BER_TYPE_UCS2) 1078 const_iv (BER_TYPE_UCS2)
1018 const_iv (BER_TYPE_IPADDRESS) 1086 const_iv (BER_TYPE_IPADDRESS)
1019 const_iv (BER_TYPE_CROAK) 1087 const_iv (BER_TYPE_CROAK)
1020 1088
1021 const_iv (SNMP_IPADDRESS) 1089 const_iv (SNMP_IPADDRESS)
1022 const_iv (SNMP_COUNTER32) 1090 const_iv (SNMP_COUNTER32)
1091 const_iv (SNMP_GAUGE32)
1023 const_iv (SNMP_UNSIGNED32) 1092 const_iv (SNMP_UNSIGNED32)
1024 const_iv (SNMP_TIMETICKS) 1093 const_iv (SNMP_TIMETICKS)
1025 const_iv (SNMP_OPAQUE) 1094 const_iv (SNMP_OPAQUE)
1026 const_iv (SNMP_COUNTER64) 1095 const_iv (SNMP_COUNTER64)
1027 }; 1096 };
1028 1097
1029 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--)
1030 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1099 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1031} 1100}
1032 1101
1033SV * 1102void
1034ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1103ber_decode (SV *ber, SV *profile = &PL_sv_undef)
1104 ALIAS:
1105 ber_decode_prefix = 1
1035 CODE: 1106 PPCODE:
1036{ 1107{
1037 cur_profile = SvPROFILE (profile); 1108 cur_profile = SvPROFILE (profile);
1038 STRLEN len; 1109 STRLEN len;
1039 buf = (U8 *)SvPVbyte (ber, len); 1110 buf = (U8 *)SvPVbyte (ber, len);
1040 cur = buf; 1111 cur = buf;
1041 end = buf + len; 1112 end = buf + len;
1042 1113
1043 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");
1044} 1123}
1045 OUTPUT: RETVAL
1046 1124
1047void 1125void
1048ber_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)
1049 PPCODE: 1127 PPCODE:
1050{ 1128{
1051 if (!SvOK (tuple)) 1129 if (!SvOK (tuple))
1052 XSRETURN_NO; 1130 XSRETURN_NO;
1053 1131
1055 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1133 croak ("ber_is: tuple must be BER tuple (array-ref)");
1056 1134
1057 AV *av = (AV *)SvRV (tuple); 1135 AV *av = (AV *)SvRV (tuple);
1058 1136
1059 XPUSHs ( 1137 XPUSHs (
1060 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1138 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1061 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1139 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1062 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1140 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1063 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1141 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1064 ? &PL_sv_yes : &PL_sv_undef); 1142 ? &PL_sv_yes : &PL_sv_undef);
1065} 1143}
1066 1144
1067void 1145void
1068ber_is_seq (SV *tuple) 1146ber_is_seq (SV *tuple)
1072 XSRETURN_UNDEF; 1150 XSRETURN_UNDEF;
1073 1151
1074 AV *av = ber_tuple (tuple); 1152 AV *av = ber_tuple (tuple);
1075 1153
1076 XPUSHs ( 1154 XPUSHs (
1077 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1155 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1078 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1156 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1079 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1157 && SvIV (AvARRAY (av)[BER_FLAGS])
1080 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1158 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1081} 1159}
1082 1160
1083void 1161void
1084ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1162ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1085 PPCODE: 1163 PPCODE:
1086{ 1164{
1087 if (!SvOK (tuple)) 1165 if (!SvOK (tuple))
1088 XSRETURN_NO; 1166 XSRETURN_NO;
1089 1167
1090 AV *av = ber_tuple (tuple); 1168 AV *av = ber_tuple (tuple);
1091 1169
1092 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1170 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1093 1171
1094 XPUSHs ( 1172 XPUSHs (
1095 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1173 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1096 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1174 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1097 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1175 && !SvIV (AvARRAY (av)[BER_FLAGS])
1098 && (!SvOK (value) || data == SvIV (value)) 1176 && (!SvOK (value) || data == SvUV (value))
1099 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1177 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1100 : &PL_sv_undef); 1178 : &PL_sv_undef);
1101} 1179}
1102 1180
1103void 1181void
1104ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1182ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
1108 XSRETURN_NO; 1186 XSRETURN_NO;
1109 1187
1110 AV *av = ber_tuple (tuple); 1188 AV *av = ber_tuple (tuple);
1111 1189
1112 XPUSHs ( 1190 XPUSHs (
1113 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1191 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1114 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1192 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1115 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1193 && !SvIV (AvARRAY (av)[BER_FLAGS])
1116 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1194 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1117 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1195 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1118} 1196}
1119 1197
1120############################################################################# 1198#############################################################################
1133 SvCUR_set (buf_sv, cur - buf); 1211 SvCUR_set (buf_sv, cur - buf);
1134 XPUSHs (buf_sv); 1212 XPUSHs (buf_sv);
1135} 1213}
1136 1214
1137SV * 1215SV *
1138ber_i32 (IV iv) 1216ber_int (SV *sv)
1139 CODE: 1217 CODE:
1140{ 1218{
1141 AV *av = newAV (); 1219 AV *av = newAV ();
1142 av_fill (av, BER_ARRAYSIZE - 1); 1220 av_fill (av, BER_ARRAYSIZE - 1);
1143 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1221 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1144 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1222 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1145 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1223 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1146 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1224 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1147 RETVAL = newRV_noinc ((SV *)av); 1225 RETVAL = newRV_noinc ((SV *)av);
1148} 1226}
1149 OUTPUT: RETVAL 1227 OUTPUT: RETVAL
1150 1228
1151# TODO: not arrayref, but elements? 1229# TODO: not arrayref, but elements?
1153ber_seq (SV *arrayref) 1231ber_seq (SV *arrayref)
1154 CODE: 1232 CODE:
1155{ 1233{
1156 AV *av = newAV (); 1234 AV *av = newAV ();
1157 av_fill (av, BER_ARRAYSIZE - 1); 1235 av_fill (av, BER_ARRAYSIZE - 1);
1158 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1236 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1159 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1237 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1160 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1238 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1161 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1239 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1162 RETVAL = newRV_noinc ((SV *)av); 1240 RETVAL = newRV_noinc ((SV *)av);
1163} 1241}
1164 OUTPUT: RETVAL 1242 OUTPUT: RETVAL
1165 1243
1166MODULE = 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