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.28 by root, Tue Apr 23 17:55:54 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
140{ 141{
141 if (!SvOK (profile)) 142 if (!SvOK (profile))
142 return default_profile; 143 return default_profile;
143 144
144 if (!SvROK (profile)) 145 if (!SvROK (profile))
145 croak ("invalid profile"); 146 croak ("Convert::BER::XS::Profile expected");
146 147
147 profile = SvRV (profile); 148 profile = SvRV (profile);
148 149
149 if (SvSTASH (profile) != profile_stash) 150 if (SvSTASH (profile) != profile_stash)
150 croak ("invalid profile object"); 151 croak ("Convert::BER::XS::Profile expected");
151 152
152 return (void *)profile; 153 return (void *)profile;
153} 154}
154 155
155static int 156static int
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
385 { 408 {
409 UV w1, w2;
410
411 if (w < 2 * 40)
412 (w1 = w / 40), (w2 = w % 40);
413 else
414 (w1 = 2), (w2 = w - 2 * 40);
415
386 app = write_uv (app, (U8)w / 40); 416 app = write_uv (app, w1);
387 *app++ = '.'; 417 *app++ = '.';
388 app = write_uv (app, (U8)w % 40); 418 app = write_uv (app, w2);
389 } 419 }
390 420
391 while (cur < end) 421 while (cur < end)
392 { 422 {
393 // we assume an oid component is never > 64 digits 423 // we assume an oid component is never > 64 digits
406static SV * 436static SV *
407decode_ucs (int chrsize) 437decode_ucs (int chrsize)
408{ 438{
409 SV *res = NEWSV (0, 0); 439 SV *res = NEWSV (0, 0);
410 440
411 U32 len = get_length (); 441 UV len = get_length ();
412 442
413 if (len & (chrsize - 1)) 443 if (len & (chrsize - 1))
414 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len); 444 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
415 445
416 while (len) 446 while (len)
437 467
438 return res; 468 return res;
439} 469}
440 470
441static SV * 471static SV *
442decode_ber () 472decode_ber (void)
443{ 473{
444 int identifier = get_u8 (); 474 int identifier = get_u8 ();
445 475
446 SV *res; 476 SV *res;
447 477
450 int tag = identifier & ASN_TAG_MASK; 480 int tag = identifier & ASN_TAG_MASK;
451 481
452 if (tag == ASN_TAG_BER) 482 if (tag == ASN_TAG_BER)
453 tag = get_w (); 483 tag = get_w ();
454 484
455 if (tag == ASN_TAG_BER)
456 tag = get_w ();
457
458 if (constructed) 485 if (constructed)
459 { 486 {
460 U32 len = get_length (); 487 UV len = get_length ();
461 U32 seqend = (cur - buf) + len; 488 UV seqend = (cur - buf) + len;
462 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 489 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
463 490
464 while (cur < buf + seqend) 491 while (cur < buf + seqend)
465 av_push (av, decode_ber ()); 492 av_push (av, decode_ber ());
466 493
467 if (cur > buf + seqend) 494 if (cur > buf + seqend)
468 croak ("constructed type %02x overflow (%x %x)\n", identifier, cur - buf, seqend); 495 croak ("CONSTRUCTED type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
469 496
470 res = newRV_inc ((SV *)av); 497 res = newRV_inc ((SV *)av);
471 } 498 }
472 else 499 else
473 switch (profile_lookup (cur_profile, klass, tag)) 500 switch (profile_lookup (cur_profile, klass, tag))
474 { 501 {
475 case BER_TYPE_NULL: 502 case BER_TYPE_NULL:
476 { 503 {
477 U32 len = get_length (); 504 UV len = get_length ();
478 505
479 if (len) 506 if (len)
480 croak ("BER_TYPE_NULL value with non-zero length %d encountered", len); 507 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
481 508
482 res = &PL_sv_undef; 509 res = &PL_sv_undef;
483 } 510 }
484 break; 511 break;
485 512
486 case BER_TYPE_BOOL: 513 case BER_TYPE_BOOL:
487 { 514 {
488 U32 len = get_length (); 515 UV len = get_length ();
489 516
490 if (len != 1) 517 if (len != 1)
491 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len); 518 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
492 519
493 res = newSVcacheint (!!get_u8 ()); 520 res = newSVcacheint (!!get_u8 ());
494 } 521 }
495 break; 522 break;
496 523
515 res = decode_data (); 542 res = decode_data ();
516 break; 543 break;
517 544
518 case BER_TYPE_IPADDRESS: 545 case BER_TYPE_IPADDRESS:
519 { 546 {
520 U32 len = get_length (); 547 UV len = get_length ();
521 548
522 if (len != 4) 549 if (len != 4)
523 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 550 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
524 551
525 U8 c1 = get_u8 (); 552 U8 c1 = get_u8 ();
526 U8 c2 = get_u8 (); 553 U8 c2 = get_u8 ();
527 U8 c3 = get_u8 (); 554 U8 c3 = get_u8 ();
528 U8 c4 = get_u8 (); 555 U8 c4 = get_u8 ();
538 case BER_TYPE_UCS4: 565 case BER_TYPE_UCS4:
539 res = decode_ucs (4); 566 res = decode_ucs (4);
540 break; 567 break;
541 568
542 case BER_TYPE_REAL: 569 case BER_TYPE_REAL:
570 error ("BER_TYPE_REAL not implemented");
571
543 case BER_TYPE_CROAK: 572 case BER_TYPE_CROAK:
573 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
574
544 default: 575 default:
545 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 576 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
546 } 577 }
547 578
548 AV *av = newAV (); 579 AV *av = newAV ();
549 av_fill (av, BER_ARRAYSIZE - 1); 580 av_fill (av, BER_ARRAYSIZE - 1);
550 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 581 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
551 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 582 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
552 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 583 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
553 AvARRAY (av)[BER_DATA ] = res; 584 AvARRAY (av)[BER_DATA ] = res;
554 585
555 return newRV_noinc ((SV *)av); 586 return newRV_noinc ((SV *)av);
556} 587}
557 588
558///////////////////////////////////////////////////////////////////////////// 589/////////////////////////////////////////////////////////////////////////////
563strlen_sum (STRLEN l1, STRLEN l2) 594strlen_sum (STRLEN l1, STRLEN l2)
564{ 595{
565 size_t sum = l1 + l2; 596 size_t sum = l1 + l2;
566 597
567 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 598 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
568 croak ("JSON::XS: string size overflow"); 599 croak ("Convert::BER::XS: string size overflow");
569 600
570 return sum; 601 return sum;
571} 602}
572 603
573static void 604static void
611 need (1); 642 need (1);
612 *cur++ = val; 643 *cur++ = val;
613} 644}
614 645
615static void 646static void
616put_w_nocheck (U32 val) 647put_w_nocheck (UV val)
617{ 648{
649#if UVSIZE > 4
650 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
651 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
652 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
653 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
654 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
655#endif
618 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 656 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
619 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 657 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
620 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 658 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
621 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 659 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
622 *cur = val & 0x7f; cur += 1; 660 *cur = val & 0x7f; cur += 1;
623} 661}
624 662
625static void 663static void
626put_w (U32 val) 664put_w (UV val)
627{ 665{
628 need (5); // we only handle up to 5 bytes 666 need (5); // we only handle up to 5 bytes
629 667
630 put_w_nocheck (val); 668 put_w_nocheck (val);
631} 669}
632 670
633static U8 * 671static U8 *
634put_length_at (U32 val, U8 *cur) 672put_length_at (UV val, U8 *cur)
635{ 673{
636 if (val < 0x7fU) 674 if (val < 0x7fU)
637 *cur++ = val; 675 *cur++ = val;
638 else 676 else
639 { 677 {
640 U8 *lenb = cur++; 678 U8 *lenb = cur++;
641 679
642 *cur = val >> 24; cur += *cur > 0; 680#if UVSIZE > 4
643 *cur = val >> 16; cur += *cur > 0; 681 *cur = val >> 56; cur += val >= ((UV)1 << (8 * 7));
644 *cur = val >> 8; cur += *cur > 0; 682 *cur = val >> 48; cur += val >= ((UV)1 << (8 * 6));
683 *cur = val >> 40; cur += val >= ((UV)1 << (8 * 5));
684 *cur = val >> 32; cur += val >= ((UV)1 << (8 * 4));
685#endif
686 *cur = val >> 24; cur += val >= ((UV)1 << (8 * 3));
687 *cur = val >> 16; cur += val >= ((UV)1 << (8 * 2));
688 *cur = val >> 8; cur += val >= ((UV)1 << (8 * 1));
645 *cur = val ; cur += 1; 689 *cur = val ; cur += 1;
646 690
647 *lenb = 0x80 + cur - lenb - 1; 691 *lenb = 0x80 + cur - lenb - 1;
648 } 692 }
649 693
650 return cur; 694 return cur;
651} 695}
652 696
653static void 697static void
654put_length (U32 val) 698put_length (UV val)
655{ 699{
656 need (5 + val); 700 need (5 + val);
657 cur = put_length_at (val, cur); 701 cur = put_length_at (val, cur);
658} 702}
659 703
660// return how many bytes the encoded length requires 704// return how many bytes the encoded length requires
661static int length_length (U32 val) 705static int length_length (UV val)
662{ 706{
663 return val < 0x7fU 707 return val < 0x7fU
664 ? 1 708 ? 1
665 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 709 : 2
710 + (val > 0xffU)
711 + (val > 0xffffU)
712 + (val > 0xffffffU)
713#if UVSIZE > 4
714 + (val > 0xffffffffU)
715 + (val > 0xffffffffffU)
716 + (val > 0xffffffffffffU)
717 + (val > 0xffffffffffffffU)
718#endif
719 ;
666} 720}
667 721
668static void 722static void
669encode_data (const char *ptr, STRLEN len) 723encode_data (const char *ptr, STRLEN len)
670{ 724{
732 786
733 *lenb = cur - lenb - 1; 787 *lenb = cur - lenb - 1;
734} 788}
735 789
736// we don't know the length yet, so we optimistically 790// we don't know the length yet, so we optimistically
737// assume the length will need one octet later. if that 791// assume the length will need one octet later. If that
738// turns out to be wrong, we memove as needed. 792// turns out to be wrong, we memmove as needed.
739// mark the beginning 793// mark the beginning
740static STRLEN 794static STRLEN
741len_fixup_mark () 795len_fixup_mark (void)
742{ 796{
743 return cur++ - buf; 797 return cur++ - buf;
744} 798}
745 799
746// patch up the length 800// patch up the length
855{ 909{
856 AV *av = ber_tuple (tuple); 910 AV *av = ber_tuple (tuple);
857 911
858 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 912 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
859 int tag = SvIV (AvARRAY (av)[BER_TAG]); 913 int tag = SvIV (AvARRAY (av)[BER_TAG]);
860 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 914 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
861 SV *data = AvARRAY (av)[BER_DATA]; 915 SV *data = AvARRAY (av)[BER_DATA];
862 916
863 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 917 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
864 918
865 if (expect_false (tag >= ASN_TAG_BER)) 919 if (expect_false (tag >= ASN_TAG_BER))
876 // and adjust later 930 // and adjust later
877 need (1); 931 need (1);
878 STRLEN mark = len_fixup_mark (); 932 STRLEN mark = len_fixup_mark ();
879 933
880 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV)) 934 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV))
881 croak ("BER constructed data must be array-reference"); 935 croak ("BER CONSTRUCTED data must be array-reference");
882 936
883 AV *av = (AV *)SvRV (data); 937 AV *av = (AV *)SvRV (data);
884 int fill = AvFILL (av); 938 int fill = AvFILL (av);
885 939
886 if (expect_false (SvRMAGICAL (av))) 940 if (expect_false (SvRMAGICAL (av)))
887 croak ("BER constructed data must not be tied"); 941 croak ("BER CONSTRUCTED data must not be tied");
888 942
889 int i; 943 int i;
890 for (i = 0; i <= fill; ++i) 944 for (i = 0; i <= fill; ++i)
891 encode_ber (AvARRAY (av)[i]); 945 encode_ber (AvARRAY (av)[i]);
892 946
899 put_length (0); 953 put_length (0);
900 break; 954 break;
901 955
902 case BER_TYPE_BOOL: 956 case BER_TYPE_BOOL:
903 put_length (1); 957 put_length (1);
904 *cur++ = SvTRUE (data) ? 0xff : 0x00; 958 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
905 break; 959 break;
906 960
907 case BER_TYPE_OID: 961 case BER_TYPE_OID:
908 encode_oid (data, 0); 962 encode_oid (data, 0);
909 break; 963 break;
947 case BER_TYPE_UCS4: 1001 case BER_TYPE_UCS4:
948 encode_ucs (data, 4); 1002 encode_ucs (data, 4);
949 break; 1003 break;
950 1004
951 case BER_TYPE_REAL: 1005 case BER_TYPE_REAL:
1006 croak ("BER_TYPE_REAL not implemented");
1007
952 case BER_TYPE_CROAK: 1008 case BER_TYPE_CROAK:
1009 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
1010
953 default: 1011 default:
954 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 1012 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
955 } 1013 }
956 1014
957} 1015}
972 const char *name; 1030 const char *name;
973 IV iv; 1031 IV iv;
974 } *civ, const_iv[] = { 1032 } *civ, const_iv[] = {
975#define const_iv(name) { # name, name }, 1033#define const_iv(name) { # name, name },
976 const_iv (ASN_BOOLEAN) 1034 const_iv (ASN_BOOLEAN)
977 const_iv (ASN_INTEGER32) 1035 const_iv (ASN_INTEGER)
978 const_iv (ASN_BIT_STRING) 1036 const_iv (ASN_BIT_STRING)
979 const_iv (ASN_OCTET_STRING) 1037 const_iv (ASN_OCTET_STRING)
980 const_iv (ASN_NULL) 1038 const_iv (ASN_NULL)
981 const_iv (ASN_OBJECT_IDENTIFIER) 1039 const_iv (ASN_OBJECT_IDENTIFIER)
982 const_iv (ASN_OBJECT_DESCRIPTOR) 1040 const_iv (ASN_OBJECT_DESCRIPTOR)
1011 const_iv (ASN_CONTEXT) 1069 const_iv (ASN_CONTEXT)
1012 const_iv (ASN_PRIVATE) 1070 const_iv (ASN_PRIVATE)
1013 1071
1014 const_iv (BER_CLASS) 1072 const_iv (BER_CLASS)
1015 const_iv (BER_TAG) 1073 const_iv (BER_TAG)
1016 const_iv (BER_CONSTRUCTED) 1074 const_iv (BER_FLAGS)
1017 const_iv (BER_DATA) 1075 const_iv (BER_DATA)
1018 1076
1019 const_iv (BER_TYPE_BYTES) 1077 const_iv (BER_TYPE_BYTES)
1020 const_iv (BER_TYPE_UTF8) 1078 const_iv (BER_TYPE_UTF8)
1021 const_iv (BER_TYPE_UCS2) 1079 const_iv (BER_TYPE_UCS2)
1029 const_iv (BER_TYPE_IPADDRESS) 1087 const_iv (BER_TYPE_IPADDRESS)
1030 const_iv (BER_TYPE_CROAK) 1088 const_iv (BER_TYPE_CROAK)
1031 1089
1032 const_iv (SNMP_IPADDRESS) 1090 const_iv (SNMP_IPADDRESS)
1033 const_iv (SNMP_COUNTER32) 1091 const_iv (SNMP_COUNTER32)
1092 const_iv (SNMP_GAUGE32)
1034 const_iv (SNMP_UNSIGNED32) 1093 const_iv (SNMP_UNSIGNED32)
1035 const_iv (SNMP_TIMETICKS) 1094 const_iv (SNMP_TIMETICKS)
1036 const_iv (SNMP_OPAQUE) 1095 const_iv (SNMP_OPAQUE)
1037 const_iv (SNMP_COUNTER64) 1096 const_iv (SNMP_COUNTER64)
1038 }; 1097 };
1039 1098
1040 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) 1099 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)); 1100 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1042} 1101}
1043 1102
1044SV * 1103void
1045ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1104ber_decode (SV *ber, SV *profile = &PL_sv_undef)
1105 ALIAS:
1106 ber_decode_prefix = 1
1046 CODE: 1107 PPCODE:
1047{ 1108{
1048 cur_profile = SvPROFILE (profile); 1109 cur_profile = SvPROFILE (profile);
1049 STRLEN len; 1110 STRLEN len;
1050 buf = (U8 *)SvPVbyte (ber, len); 1111 buf = (U8 *)SvPVbyte (ber, len);
1051 cur = buf; 1112 cur = buf;
1052 end = buf + len; 1113 end = buf + len;
1053 1114
1054 RETVAL = decode_ber (); 1115 SV *tuple = decode_ber ();
1116
1117 EXTEND (SP, 2);
1118 PUSHs (sv_2mortal (tuple));
1119
1120 if (ix)
1121 PUSHs (sv_2mortal (newSViv (cur - buf)));
1122 else if (cur != end)
1123 error ("trailing garbage after BER value");
1055} 1124}
1056 OUTPUT: RETVAL
1057 1125
1058void 1126void
1059ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &PL_sv_undef, SV *data = &PL_sv_undef) 1127ber_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: 1128 PPCODE:
1061{ 1129{
1062 if (!SvOK (tuple)) 1130 if (!SvOK (tuple))
1063 XSRETURN_NO; 1131 XSRETURN_NO;
1064 1132
1066 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1134 croak ("ber_is: tuple must be BER tuple (array-ref)");
1067 1135
1068 AV *av = (AV *)SvRV (tuple); 1136 AV *av = (AV *)SvRV (tuple);
1069 1137
1070 XPUSHs ( 1138 XPUSHs (
1071 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1139 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1072 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1140 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1073 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1141 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1074 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1142 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1075 ? &PL_sv_yes : &PL_sv_undef); 1143 ? &PL_sv_yes : &PL_sv_undef);
1076} 1144}
1077 1145
1078void 1146void
1079ber_is_seq (SV *tuple) 1147ber_is_seq (SV *tuple)
1083 XSRETURN_UNDEF; 1151 XSRETURN_UNDEF;
1084 1152
1085 AV *av = ber_tuple (tuple); 1153 AV *av = ber_tuple (tuple);
1086 1154
1087 XPUSHs ( 1155 XPUSHs (
1088 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1156 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1089 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1157 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1090 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1158 && SvIV (AvARRAY (av)[BER_FLAGS])
1091 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1159 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1092} 1160}
1093 1161
1094void 1162void
1095ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1163ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1096 PPCODE: 1164 PPCODE:
1097{ 1165{
1098 if (!SvOK (tuple)) 1166 if (!SvOK (tuple))
1099 XSRETURN_NO; 1167 XSRETURN_NO;
1100 1168
1101 AV *av = ber_tuple (tuple); 1169 AV *av = ber_tuple (tuple);
1102 1170
1103 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1171 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1104 1172
1105 XPUSHs ( 1173 XPUSHs (
1106 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1174 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1107 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1175 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1108 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1176 && !SvIV (AvARRAY (av)[BER_FLAGS])
1109 && (!SvOK (value) || data == SvIV (value)) 1177 && (!SvOK (value) || data == SvUV (value))
1110 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1178 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1111 : &PL_sv_undef); 1179 : &PL_sv_undef);
1112} 1180}
1113 1181
1114void 1182void
1115ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1183ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
1119 XSRETURN_NO; 1187 XSRETURN_NO;
1120 1188
1121 AV *av = ber_tuple (tuple); 1189 AV *av = ber_tuple (tuple);
1122 1190
1123 XPUSHs ( 1191 XPUSHs (
1124 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1192 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1125 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1193 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1126 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1194 && !SvIV (AvARRAY (av)[BER_FLAGS])
1127 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1195 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1128 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1196 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1129} 1197}
1130 1198
1131############################################################################# 1199#############################################################################
1144 SvCUR_set (buf_sv, cur - buf); 1212 SvCUR_set (buf_sv, cur - buf);
1145 XPUSHs (buf_sv); 1213 XPUSHs (buf_sv);
1146} 1214}
1147 1215
1148SV * 1216SV *
1149ber_i32 (IV iv) 1217ber_int (SV *sv)
1150 CODE: 1218 CODE:
1151{ 1219{
1152 AV *av = newAV (); 1220 AV *av = newAV ();
1153 av_fill (av, BER_ARRAYSIZE - 1); 1221 av_fill (av, BER_ARRAYSIZE - 1);
1154 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1222 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1155 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1223 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1156 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1224 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1157 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1225 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1158 RETVAL = newRV_noinc ((SV *)av); 1226 RETVAL = newRV_noinc ((SV *)av);
1159} 1227}
1160 OUTPUT: RETVAL 1228 OUTPUT: RETVAL
1161 1229
1162# TODO: not arrayref, but elements? 1230# TODO: not arrayref, but elements?
1164ber_seq (SV *arrayref) 1232ber_seq (SV *arrayref)
1165 CODE: 1233 CODE:
1166{ 1234{
1167 AV *av = newAV (); 1235 AV *av = newAV ();
1168 av_fill (av, BER_ARRAYSIZE - 1); 1236 av_fill (av, BER_ARRAYSIZE - 1);
1169 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1237 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1170 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1238 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1171 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1239 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1172 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1240 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1173 RETVAL = newRV_noinc ((SV *)av); 1241 RETVAL = newRV_noinc ((SV *)av);
1174} 1242}
1175 OUTPUT: RETVAL 1243 OUTPUT: RETVAL
1176 1244
1177MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1245MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines