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.11 by root, Sat Apr 20 12:25:23 2019 UTC vs.
Revision 1.25 by root, Sun Apr 21 10:40:30 2019 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5// C99 required 5// C99 required!
6// this is not just for comments, but also for
7// integer constant semantics,
8// sscanf format modifiers and more.
6 9
7enum { 10enum {
8 // ASN_TAG 11 // ASN_TAG
9 ASN_BOOLEAN = 0x01, 12 ASN_BOOLEAN = 0x01,
10 ASN_INTEGER32 = 0x02, 13 ASN_INTEGER = 0x02,
11 ASN_BIT_STRING = 0x03, 14 ASN_BIT_STRING = 0x03,
12 ASN_OCTET_STRING = 0x04, 15 ASN_OCTET_STRING = 0x04,
13 ASN_NULL = 0x05, 16 ASN_NULL = 0x05,
14 ASN_OBJECT_IDENTIFIER = 0x06, 17 ASN_OBJECT_IDENTIFIER = 0x06,
15 ASN_OID = 0x06, 18 ASN_OID = 0x06,
55 ASN_CLASS_SHIFT = 6, 58 ASN_CLASS_SHIFT = 6,
56 59
57 // ASN_APPLICATION SNMP 60 // ASN_APPLICATION SNMP
58 SNMP_IPADDRESS = 0x00, 61 SNMP_IPADDRESS = 0x00,
59 SNMP_COUNTER32 = 0x01, 62 SNMP_COUNTER32 = 0x01,
63 SNMP_GAUGE32 = 0x02,
60 SNMP_UNSIGNED32 = 0x02, 64 SNMP_UNSIGNED32 = 0x02,
61 SNMP_TIMETICKS = 0x03, 65 SNMP_TIMETICKS = 0x03,
62 SNMP_OPAQUE = 0x04, 66 SNMP_OPAQUE = 0x04,
63 SNMP_COUNTER64 = 0x06, 67 SNMP_COUNTER64 = 0x06,
64}; 68};
77 BER_TYPE_IPADDRESS, 81 BER_TYPE_IPADDRESS,
78 BER_TYPE_CROAK, 82 BER_TYPE_CROAK,
79}; 83};
80 84
81enum { 85enum {
82 BER_CLASS = 0, 86 BER_CLASS = 0,
83 BER_TAG = 1, 87 BER_TAG = 1,
84 BER_CONSTRUCTED = 2, 88 BER_FLAGS = 2,
85 BER_DATA = 3, 89 BER_DATA = 3,
86 BER_ARRAYSIZE 90 BER_ARRAYSIZE
87}; 91};
88 92
89#define MAX_OID_STRLEN 4096 93#define MAX_OID_STRLEN 4096
90 94
178 182
179 SvPVX (sv)[idx] = type; 183 SvPVX (sv)[idx] = type;
180} 184}
181 185
182static SV * 186static SV *
183profile_new () 187profile_new (void)
184{ 188{
185 SV *sv = newSVpvn ("", 0); 189 SV *sv = newSVpvn ("", 0);
186 190
187 static const struct { 191 static const struct {
188 int klass; 192 int klass;
189 int tag; 193 int tag;
190 int type; 194 int type;
191 } *celem, default_map[] = { 195 } *celem, default_map[] = {
192 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL }, 196 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },
193 { ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT }, 197 { ASN_UNIVERSAL, ASN_INTEGER , BER_TYPE_INT },
194 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL }, 198 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },
195 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID }, 199 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID },
196 { ASN_UNIVERSAL, ASN_OBJECT_DESCRIPTOR, BER_TYPE_OID },
197 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID }, 200 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
198 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL }, 201 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
202 { ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
199 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 }, 203 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },
200 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 }, 204 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },
201 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 }, 205 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },
202 }; 206 };
203 207
224} 228}
225 229
226// get_* functions fetch something from the buffer 230// get_* functions fetch something from the buffer
227// decode_* functions use get_* fun ctions to decode ber values 231// decode_* functions use get_* fun ctions to decode ber values
228 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
229// get n octets 243// get n octets
230static U8 * 244static U8 *
231get_n (UV count) 245get_n (UV count)
232{ 246{
233 want (count); 247 want (count);
234 U8 *res = cur; 248 U8 *res = cur;
235 cur += count; 249 cur += count;
236 return res; 250 return res;
237} 251}
238 252
239// get single octet
240static U8
241get_u8 (void)
242{
243 if (cur == end)
244 error ("unexpected end of message buffer");
245
246 return *cur++;
247}
248
249// get ber-encoded integer (i.e. pack "w") 253// get ber-encoded integer (i.e. pack "w")
250static U32 254static UV
251get_w (void) 255get_w (void)
252{ 256{
253 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)");
254 262
255 for (;;) 263 for (;;)
256 { 264 {
257 U8 c = get_u8 (); 265 if (expect_false (res >> UVSIZE * 8 - 7))
266 error ("BER variable length integer overflow");
267
258 res = (res << 7) | (c & 0x7f); 268 res = (res << 7) | (c & 0x7f);
259 269
260 if (!(c & 0x80)) 270 if (!(c & 0x80))
261 return res; 271 return res;
262 }
263}
264 272
273 c = get_u8 ();
274 }
275}
276
265static U32 277static UV
266get_length (void) 278get_length (void)
267{ 279{
268 U32 res = get_u8 (); 280 UV res = get_u8 ();
269 281
270 if (res & 0x80) 282 if (res & 0x80)
271 { 283 {
272 int cnt = res & 0x7f; 284 int cnt = res & 0x7f;
273 res = 0; 285 res = 0;
274 286
275 switch (cnt) 287 switch (cnt)
276 { 288 {
277 case 0: 289 case 0:
278 error ("indefinite ASN.1 lengths not supported"); 290 error ("indefinite BER value lengths not supported");
279 return 0; 291
292 case 0x7f:
293 error ("BER reserved value in length (X.690 8.1.3.5)");
280 294
281 default: 295 default:
282 error ("ASN.1 length too long"); 296 error ("BER value length too long (must fit into UV)");
283 return 0;
284 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
285 case 4: res = (res << 8) | get_u8 (); 304 case 4: res = (res << 8) | get_u8 ();
286 case 3: res = (res << 8) | get_u8 (); 305 case 3: res = (res << 8) | get_u8 ();
287 case 2: res = (res << 8) | get_u8 (); 306 case 2: res = (res << 8) | get_u8 ();
288 case 1: res = (res << 8) | get_u8 (); 307 case 1: res = (res << 8) | get_u8 ();
289 } 308 }
291 310
292 return res; 311 return res;
293} 312}
294 313
295static SV * 314static SV *
296decode_int () 315decode_int (void)
297{ 316{
298 int len = get_length (); 317 UV len = get_length ();
299 318
300 if (len <= 0) 319 if (!len)
301 { 320 error ("invalid BER_TYPE_INT length zero (X.690 8.3.1)");
302 error ("integer length equal to zero");
303 return 0;
304 }
305 321
306 U8 *data = get_n (len); 322 U8 *data = get_n (len);
307 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
308 int negative = data [0] & 0x80; 332 int negative = data [0] & 0x80;
309 333
310 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");
311 338
312 do 339 do
313 val = (val << 8) | *data++; 340 val = (val << 8) | *data++;
314 while (--len); 341 while (--len);
315 342
319} 346}
320 347
321static SV * 348static SV *
322decode_data (void) 349decode_data (void)
323{ 350{
324 U32 len = get_length (); 351 UV len = get_length ();
325 U8 *data = get_n (len);
326 return newSVpvn ((char *)data, len); 352 return newSVpvn ((char *)get_n (len), len);
327} 353}
328 354
329// gelper for decode_object_identifier 355// helper for decode_object_identifier
330static char * 356static char *
331write_uv (char *buf, U32 u) 357write_uv (char *buf, UV u)
332{ 358{
333 // 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)
334 if (expect_true (u < 10)) 360 if (expect_true (u < 10))
335 *buf++ = u + '0'; 361 *buf++ = u + '0';
336 else 362 else
337 { 363 {
364 // this *could* be done much faster using branchless fixed-point arithmetics
338 char *beg = buf; 365 char *beg = buf;
339 366
340 do 367 do
341 { 368 {
342 *buf++ = u % 10 + '0'; 369 *buf++ = u % 10 + '0';
344 } 371 }
345 while (u); 372 while (u);
346 373
347 // reverse digits 374 // reverse digits
348 char *ptr = buf; 375 char *ptr = buf;
349 while (--ptr != beg) 376 while (--ptr > beg)
350 { 377 {
351 char c = *ptr; 378 char c = *ptr;
352 *ptr = *beg; 379 *ptr = *beg;
353 *beg = c; 380 *beg = c;
354 ++beg; 381 ++beg;
359} 386}
360 387
361static SV * 388static SV *
362decode_oid (int relative) 389decode_oid (int relative)
363{ 390{
364 U32 len = get_length (); 391 UV len = get_length ();
365 392
366 if (len <= 0) 393 if (len <= 0)
367 { 394 {
368 error ("OBJECT IDENTIFIER length equal to zero"); 395 error ("BER_TYPE_OID length must not be zero");
369 return &PL_sv_undef; 396 return &PL_sv_undef;
370 } 397 }
371 398
372 U8 *end = cur + len; 399 U8 *end = cur + len;
373 U32 w = get_w (); 400 UV w = get_w ();
374 401
375 static char oid[MAX_OID_STRLEN]; // must be static 402 static char oid[MAX_OID_STRLEN]; // static, because too large for stack
376 char *app = oid; 403 char *app = oid;
377 404
378 if (relative) 405 if (relative)
379 app = write_uv (app, w); 406 app = write_uv (app, w);
380 else 407 else if (w < 2 * 40)
381 { 408 {
382 app = write_uv (app, (U8)w / 40); 409 app = write_uv (app, (U8)w / 40);
383 *app++ = '.'; 410 *app++ = '.';
384 app = write_uv (app, (U8)w % 40); 411 app = write_uv (app, (U8)w % 40);
385 } 412 }
413 else
414 {
415 app = write_uv (app, 2);
416 *app++ = '.';
417 app = write_uv (app, w - 2 * 40);
418 }
386 419
420 while (cur < end)
421 {
387 // we assume an oid component is never > 64 bytes 422 // we assume an oid component is never > 64 digits
388 while (cur < end && oid + sizeof (oid) - app > 64) 423 if (oid + sizeof (oid) - app < 64)
389 { 424 croak ("BER_TYPE_OID to long to decode");
425
390 w = get_w (); 426 w = get_w ();
391 *app++ = '.'; 427 *app++ = '.';
392 app = write_uv (app, w); 428 app = write_uv (app, w);
393 } 429 }
394 430
399static SV * 435static SV *
400decode_ucs (int chrsize) 436decode_ucs (int chrsize)
401{ 437{
402 SV *res = NEWSV (0, 0); 438 SV *res = NEWSV (0, 0);
403 439
404 U32 len = get_length (); 440 UV len = get_length ();
405 441
406 if (len & (chrsize - 1)) 442 if (len & (chrsize - 1))
407 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);
408 444
409 while (len) 445 while (len)
430 466
431 return res; 467 return res;
432} 468}
433 469
434static SV * 470static SV *
435decode_ber () 471decode_ber (void)
436{ 472{
437 int identifier = get_u8 (); 473 int identifier = get_u8 ();
438 474
439 SV *res; 475 SV *res;
440 476
443 int tag = identifier & ASN_TAG_MASK; 479 int tag = identifier & ASN_TAG_MASK;
444 480
445 if (tag == ASN_TAG_BER) 481 if (tag == ASN_TAG_BER)
446 tag = get_w (); 482 tag = get_w ();
447 483
448 if (tag == ASN_TAG_BER)
449 tag = get_w ();
450
451 if (constructed) 484 if (constructed)
452 { 485 {
453 U32 len = get_length (); 486 UV len = get_length ();
454 U32 seqend = (cur - buf) + len; 487 UV seqend = (cur - buf) + len;
455 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 488 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
456 489
457 while (cur < buf + seqend) 490 while (cur < buf + seqend)
458 av_push (av, decode_ber ()); 491 av_push (av, decode_ber ());
459 492
460 if (cur > buf + seqend) 493 if (cur > buf + seqend)
461 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);
462 495
463 res = newRV_inc ((SV *)av); 496 res = newRV_inc ((SV *)av);
464 } 497 }
465 else 498 else
466 switch (profile_lookup (cur_profile, klass, tag)) 499 switch (profile_lookup (cur_profile, klass, tag))
467 { 500 {
468 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
469 res = &PL_sv_undef; 508 res = &PL_sv_undef;
509 }
470 break; 510 break;
471 511
472 case BER_TYPE_BOOL: 512 case BER_TYPE_BOOL:
473 { 513 {
474 U32 len = get_length (); 514 UV len = get_length ();
475 515
476 if (len != 1) 516 if (len != 1)
477 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);
478 518
479 res = newSVcacheint (get_u8 () ? 0 : 1); 519 res = newSVcacheint (!!get_u8 ());
480 } 520 }
481 break; 521 break;
482 522
483 case BER_TYPE_OID: 523 case BER_TYPE_OID:
484 res = decode_oid (0); 524 res = decode_oid (0);
501 res = decode_data (); 541 res = decode_data ();
502 break; 542 break;
503 543
504 case BER_TYPE_IPADDRESS: 544 case BER_TYPE_IPADDRESS:
505 { 545 {
506 U32 len = get_length (); 546 UV len = get_length ();
507 547
508 if (len != 4) 548 if (len != 4)
509 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);
510 550
511 U8 c1 = get_u8 (); 551 U8 c1 = get_u8 ();
512 U8 c2 = get_u8 (); 552 U8 c2 = get_u8 ();
513 U8 c3 = get_u8 (); 553 U8 c3 = get_u8 ();
514 U8 c4 = get_u8 (); 554 U8 c4 = get_u8 ();
524 case BER_TYPE_UCS4: 564 case BER_TYPE_UCS4:
525 res = decode_ucs (4); 565 res = decode_ucs (4);
526 break; 566 break;
527 567
528 case BER_TYPE_REAL: 568 case BER_TYPE_REAL:
569 error ("BER_TYPE_REAL not implemented");
570
529 case BER_TYPE_CROAK: 571 case BER_TYPE_CROAK:
572 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
573
530 default: 574 default:
531 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 575 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
532 } 576 }
533 577
534 AV *av = newAV (); 578 AV *av = newAV ();
535 av_fill (av, BER_ARRAYSIZE - 1); 579 av_fill (av, BER_ARRAYSIZE - 1);
536 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 580 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
537 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 581 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
538 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 582 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
539 AvARRAY (av)[BER_DATA ] = res; 583 AvARRAY (av)[BER_DATA ] = res;
540 584
541 return newRV_noinc ((SV *)av); 585 return newRV_noinc ((SV *)av);
542} 586}
543 587
544///////////////////////////////////////////////////////////////////////////// 588/////////////////////////////////////////////////////////////////////////////
549strlen_sum (STRLEN l1, STRLEN l2) 593strlen_sum (STRLEN l1, STRLEN l2)
550{ 594{
551 size_t sum = l1 + l2; 595 size_t sum = l1 + l2;
552 596
553 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 597 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
554 croak ("JSON::XS: string size overflow"); 598 croak ("Convert::BER::XS: string size overflow");
555 599
556 return sum; 600 return sum;
557} 601}
558 602
559static void 603static void
597 need (1); 641 need (1);
598 *cur++ = val; 642 *cur++ = val;
599} 643}
600 644
601static void 645static void
602put_w_nocheck (U32 val) 646put_w_nocheck (UV val)
603{ 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
604 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 655 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
605 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 656 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
606 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 657 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
607 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 658 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
608 *cur = val & 0x7f; cur += 1; 659 *cur = val & 0x7f; cur += 1;
609} 660}
610 661
611static void 662static void
612put_w (U32 val) 663put_w (UV val)
613{ 664{
614 need (5); // we only handle up to 5 bytes 665 need (5); // we only handle up to 5 bytes
615 666
616 put_w_nocheck (val); 667 put_w_nocheck (val);
617} 668}
618 669
619static U8 * 670static U8 *
620put_length_at (U32 val, U8 *cur) 671put_length_at (UV val, U8 *cur)
621{ 672{
622 if (val < 0x7fU) 673 if (val < 0x7fU)
623 *cur++ = val; 674 *cur++ = val;
624 else 675 else
625 { 676 {
626 U8 *lenb = cur++; 677 U8 *lenb = cur++;
627 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
628 *cur = val >> 24; cur += *cur > 0; 685 *cur = val >> 24; cur += *cur > 0;
629 *cur = val >> 16; cur += *cur > 0; 686 *cur = val >> 16; cur += *cur > 0;
630 *cur = val >> 8; cur += *cur > 0; 687 *cur = val >> 8; cur += *cur > 0;
631 *cur = val ; cur += 1; 688 *cur = val ; cur += 1;
632 689
635 692
636 return cur; 693 return cur;
637} 694}
638 695
639static void 696static void
640put_length (U32 val) 697put_length (UV val)
641{ 698{
642 need (5 + val); 699 need (5 + val);
643 cur = put_length_at (val, cur); 700 cur = put_length_at (val, cur);
644} 701}
645 702
646// return how many bytes the encoded length requires 703// return how many bytes the encoded length requires
647static int length_length (U32 val) 704static int length_length (UV val)
648{ 705{
649 return val < 0x7fU 706 return val < 0x7fU
650 ? 1 707 ? 1
651 : 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 ;
652} 719}
653 720
654static void 721static void
655encode_data (const char *ptr, STRLEN len) 722encode_data (const char *ptr, STRLEN len)
656{ 723{
718 785
719 *lenb = cur - lenb - 1; 786 *lenb = cur - lenb - 1;
720} 787}
721 788
722// we don't know the length yet, so we optimistically 789// we don't know the length yet, so we optimistically
723// assume the length will need one octet later. if that 790// assume the length will need one octet later. If that
724// turns out to be wrong, we memove as needed. 791// turns out to be wrong, we memmove as needed.
725// mark the beginning 792// mark the beginning
726static STRLEN 793static STRLEN
727len_fixup_mark () 794len_fixup_mark (void)
728{ 795{
729 return cur++ - buf; 796 return cur++ - buf;
730} 797}
731 798
732// patch up the length 799// patch up the length
841{ 908{
842 AV *av = ber_tuple (tuple); 909 AV *av = ber_tuple (tuple);
843 910
844 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 911 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
845 int tag = SvIV (AvARRAY (av)[BER_TAG]); 912 int tag = SvIV (AvARRAY (av)[BER_TAG]);
846 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 913 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
847 SV *data = AvARRAY (av)[BER_DATA]; 914 SV *data = AvARRAY (av)[BER_DATA];
848 915
849 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 916 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
850 917
851 if (expect_false (tag >= ASN_TAG_BER)) 918 if (expect_false (tag >= ASN_TAG_BER))
862 // and adjust later 929 // and adjust later
863 need (1); 930 need (1);
864 STRLEN mark = len_fixup_mark (); 931 STRLEN mark = len_fixup_mark ();
865 932
866 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV)) 933 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV))
867 croak ("BER constructed data must be array-reference"); 934 croak ("BER CONSTRUCTED data must be array-reference");
868 935
869 AV *av = (AV *)SvRV (data); 936 AV *av = (AV *)SvRV (data);
870 int fill = AvFILL (av); 937 int fill = AvFILL (av);
871 938
872 if (expect_false (SvRMAGICAL (av))) 939 if (expect_false (SvRMAGICAL (av)))
873 croak ("BER constructed data must not be tied"); 940 croak ("BER CONSTRUCTED data must not be tied");
874 941
875 int i; 942 int i;
876 for (i = 0; i <= fill; ++i) 943 for (i = 0; i <= fill; ++i)
877 encode_ber (AvARRAY (av)[i]); 944 encode_ber (AvARRAY (av)[i]);
878 945
885 put_length (0); 952 put_length (0);
886 break; 953 break;
887 954
888 case BER_TYPE_BOOL: 955 case BER_TYPE_BOOL:
889 put_length (1); 956 put_length (1);
890 *cur++ = SvTRUE (data) ? 0xff : 0x00; 957 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
891 break; 958 break;
892 959
893 case BER_TYPE_OID: 960 case BER_TYPE_OID:
894 encode_oid (data, 0); 961 encode_oid (data, 0);
895 break; 962 break;
933 case BER_TYPE_UCS4: 1000 case BER_TYPE_UCS4:
934 encode_ucs (data, 4); 1001 encode_ucs (data, 4);
935 break; 1002 break;
936 1003
937 case BER_TYPE_REAL: 1004 case BER_TYPE_REAL:
1005 croak ("BER_TYPE_REAL not implemented");
1006
938 case BER_TYPE_CROAK: 1007 case BER_TYPE_CROAK:
1008 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
1009
939 default: 1010 default:
940 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 1011 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
941 } 1012 }
942 1013
943} 1014}
958 const char *name; 1029 const char *name;
959 IV iv; 1030 IV iv;
960 } *civ, const_iv[] = { 1031 } *civ, const_iv[] = {
961#define const_iv(name) { # name, name }, 1032#define const_iv(name) { # name, name },
962 const_iv (ASN_BOOLEAN) 1033 const_iv (ASN_BOOLEAN)
963 const_iv (ASN_INTEGER32) 1034 const_iv (ASN_INTEGER)
964 const_iv (ASN_BIT_STRING) 1035 const_iv (ASN_BIT_STRING)
965 const_iv (ASN_OCTET_STRING) 1036 const_iv (ASN_OCTET_STRING)
966 const_iv (ASN_NULL) 1037 const_iv (ASN_NULL)
967 const_iv (ASN_OBJECT_IDENTIFIER) 1038 const_iv (ASN_OBJECT_IDENTIFIER)
968 const_iv (ASN_OBJECT_DESCRIPTOR) 1039 const_iv (ASN_OBJECT_DESCRIPTOR)
997 const_iv (ASN_CONTEXT) 1068 const_iv (ASN_CONTEXT)
998 const_iv (ASN_PRIVATE) 1069 const_iv (ASN_PRIVATE)
999 1070
1000 const_iv (BER_CLASS) 1071 const_iv (BER_CLASS)
1001 const_iv (BER_TAG) 1072 const_iv (BER_TAG)
1002 const_iv (BER_CONSTRUCTED) 1073 const_iv (BER_FLAGS)
1003 const_iv (BER_DATA) 1074 const_iv (BER_DATA)
1004 1075
1005 const_iv (BER_TYPE_BYTES) 1076 const_iv (BER_TYPE_BYTES)
1006 const_iv (BER_TYPE_UTF8) 1077 const_iv (BER_TYPE_UTF8)
1007 const_iv (BER_TYPE_UCS2) 1078 const_iv (BER_TYPE_UCS2)
1015 const_iv (BER_TYPE_IPADDRESS) 1086 const_iv (BER_TYPE_IPADDRESS)
1016 const_iv (BER_TYPE_CROAK) 1087 const_iv (BER_TYPE_CROAK)
1017 1088
1018 const_iv (SNMP_IPADDRESS) 1089 const_iv (SNMP_IPADDRESS)
1019 const_iv (SNMP_COUNTER32) 1090 const_iv (SNMP_COUNTER32)
1091 const_iv (SNMP_GAUGE32)
1020 const_iv (SNMP_UNSIGNED32) 1092 const_iv (SNMP_UNSIGNED32)
1021 const_iv (SNMP_TIMETICKS) 1093 const_iv (SNMP_TIMETICKS)
1022 const_iv (SNMP_OPAQUE) 1094 const_iv (SNMP_OPAQUE)
1023 const_iv (SNMP_COUNTER64) 1095 const_iv (SNMP_COUNTER64)
1024 }; 1096 };
1025 1097
1026 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--)
1027 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1099 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1028} 1100}
1029 1101
1030SV * 1102void
1031ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1103ber_decode (SV *ber, SV *profile = &PL_sv_undef)
1104 ALIAS:
1105 ber_decode_prefix = 1
1032 CODE: 1106 PPCODE:
1033{ 1107{
1034 cur_profile = SvPROFILE (profile); 1108 cur_profile = SvPROFILE (profile);
1035 STRLEN len; 1109 STRLEN len;
1036 buf = (U8 *)SvPVbyte (ber, len); 1110 buf = (U8 *)SvPVbyte (ber, len);
1037 cur = buf; 1111 cur = buf;
1038 end = buf + len; 1112 end = buf + len;
1039 1113
1040 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");
1041} 1123}
1042 OUTPUT: RETVAL
1043 1124
1044void 1125void
1045ber_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)
1046 PPCODE: 1127 PPCODE:
1047{ 1128{
1048 if (!SvOK (tuple)) 1129 if (!SvOK (tuple))
1049 XSRETURN_NO; 1130 XSRETURN_NO;
1050 1131
1052 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1133 croak ("ber_is: tuple must be BER tuple (array-ref)");
1053 1134
1054 AV *av = (AV *)SvRV (tuple); 1135 AV *av = (AV *)SvRV (tuple);
1055 1136
1056 XPUSHs ( 1137 XPUSHs (
1057 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1138 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1058 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1139 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1059 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1140 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1060 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1141 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1061 ? &PL_sv_yes : &PL_sv_undef); 1142 ? &PL_sv_yes : &PL_sv_undef);
1062} 1143}
1063 1144
1064void 1145void
1065ber_is_seq (SV *tuple) 1146ber_is_seq (SV *tuple)
1069 XSRETURN_UNDEF; 1150 XSRETURN_UNDEF;
1070 1151
1071 AV *av = ber_tuple (tuple); 1152 AV *av = ber_tuple (tuple);
1072 1153
1073 XPUSHs ( 1154 XPUSHs (
1074 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1155 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1075 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1156 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1076 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1157 && SvIV (AvARRAY (av)[BER_FLAGS])
1077 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1158 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1078} 1159}
1079 1160
1080void 1161void
1081ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1162ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1082 PPCODE: 1163 PPCODE:
1083{ 1164{
1084 if (!SvOK (tuple)) 1165 if (!SvOK (tuple))
1085 XSRETURN_NO; 1166 XSRETURN_NO;
1086 1167
1087 AV *av = ber_tuple (tuple); 1168 AV *av = ber_tuple (tuple);
1088 1169
1089 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1170 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1090 1171
1091 XPUSHs ( 1172 XPUSHs (
1092 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1173 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1093 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1174 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1094 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1175 && !SvIV (AvARRAY (av)[BER_FLAGS])
1095 && (!SvOK (value) || data == SvIV (value)) 1176 && (!SvOK (value) || data == SvUV (value))
1096 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1177 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1097 : &PL_sv_undef); 1178 : &PL_sv_undef);
1098} 1179}
1099 1180
1100void 1181void
1101ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1182ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
1105 XSRETURN_NO; 1186 XSRETURN_NO;
1106 1187
1107 AV *av = ber_tuple (tuple); 1188 AV *av = ber_tuple (tuple);
1108 1189
1109 XPUSHs ( 1190 XPUSHs (
1110 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1191 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1111 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1192 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1112 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1193 && !SvIV (AvARRAY (av)[BER_FLAGS])
1113 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1194 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1114 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1195 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1115} 1196}
1116 1197
1117############################################################################# 1198#############################################################################
1130 SvCUR_set (buf_sv, cur - buf); 1211 SvCUR_set (buf_sv, cur - buf);
1131 XPUSHs (buf_sv); 1212 XPUSHs (buf_sv);
1132} 1213}
1133 1214
1134SV * 1215SV *
1135ber_i32 (IV iv) 1216ber_int (SV *sv)
1136 CODE: 1217 CODE:
1137{ 1218{
1138 AV *av = newAV (); 1219 AV *av = newAV ();
1139 av_fill (av, BER_ARRAYSIZE - 1); 1220 av_fill (av, BER_ARRAYSIZE - 1);
1140 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1221 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1141 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1222 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1142 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1223 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1143 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1224 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1144 RETVAL = newRV_noinc ((SV *)av); 1225 RETVAL = newRV_noinc ((SV *)av);
1145} 1226}
1146 OUTPUT: RETVAL 1227 OUTPUT: RETVAL
1147 1228
1148# TODO: not arrayref, but elements? 1229# TODO: not arrayref, but elements?
1150ber_seq (SV *arrayref) 1231ber_seq (SV *arrayref)
1151 CODE: 1232 CODE:
1152{ 1233{
1153 AV *av = newAV (); 1234 AV *av = newAV ();
1154 av_fill (av, BER_ARRAYSIZE - 1); 1235 av_fill (av, BER_ARRAYSIZE - 1);
1155 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1236 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1156 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1237 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1157 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1238 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1158 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1239 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1159 RETVAL = newRV_noinc ((SV *)av); 1240 RETVAL = newRV_noinc ((SV *)av);
1160} 1241}
1161 OUTPUT: RETVAL 1242 OUTPUT: RETVAL
1162 1243
1163MODULE = 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