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.10 by root, Sat Apr 20 11:12:47 2019 UTC vs.
Revision 1.22 by root, Sat Apr 20 18:38:33 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
204 for (celem = default_map + sizeof (default_map) / sizeof (default_map [0]); celem > default_map; celem--) 208 for (celem = default_map + sizeof (default_map) / sizeof (default_map [0]); celem-- > default_map; )
205 profile_set ((void *)sv, celem->klass, celem->tag, celem->type); 209 profile_set ((profile_type *)sv, celem->klass, celem->tag, celem->type);
206 210
207 return sv_bless (newRV_noinc (sv), profile_stash); 211 return sv_bless (newRV_noinc (sv), profile_stash);
208} 212}
209 213
210///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
245 249
246 return *cur++; 250 return *cur++;
247} 251}
248 252
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 ();
258 res = (res << 7) | (c & 0x7f); 265 res = (res << 7) | (c & 0x7f);
259 266
260 if (!(c & 0x80)) 267 if (!(c & 0x80))
261 return res; 268 return res;
262 }
263}
264 269
270 c = get_u8 ();
271 }
272}
273
265static U32 274static UV
266get_length (void) 275get_length (void)
267{ 276{
268 U32 res = get_u8 (); 277 UV res = get_u8 ();
269 278
270 if (res & 0x80) 279 if (res & 0x80)
271 { 280 {
272 int cnt = res & 0x7f; 281 int cnt = res & 0x7f;
273 res = 0; 282 res = 0;
274 283
275 switch (cnt) 284 switch (cnt)
276 { 285 {
277 case 0: 286 case 0:
278 error ("indefinite ASN.1 lengths not supported"); 287 error ("indefinite ASN.1 lengths not supported");
279 return 0; 288
289 case 0x7f:
290 error ("ASN.1 reserved value in length (X.690 8.1.3.5)");
280 291
281 default: 292 default:
282 error ("ASN.1 length too long"); 293 error ("ASN.1 length too long (only up to 2**64 octets supported)");
283 return 0;
284 294
295 case 8: res = (res << 8) | get_u8 ();
296 case 7: res = (res << 8) | get_u8 ();
297 case 6: res = (res << 8) | get_u8 ();
298 case 5: res = (res << 8) | get_u8 ();
285 case 4: res = (res << 8) | get_u8 (); 299 case 4: res = (res << 8) | get_u8 ();
286 case 3: res = (res << 8) | get_u8 (); 300 case 3: res = (res << 8) | get_u8 ();
287 case 2: res = (res << 8) | get_u8 (); 301 case 2: res = (res << 8) | get_u8 ();
288 case 1: res = (res << 8) | get_u8 (); 302 case 1: res = (res << 8) | get_u8 ();
289 } 303 }
291 305
292 return res; 306 return res;
293} 307}
294 308
295static SV * 309static SV *
296decode_int () 310decode_int (void)
297{ 311{
298 int len = get_length (); 312 UV len = get_length ();
299 313
300 if (len <= 0) 314 if (!len)
301 {
302 error ("integer length equal to zero"); 315 error ("invalid integer length equal to zero (X.690 8.3.1)");
303 return 0;
304 }
305 316
306 U8 *data = get_n (len); 317 U8 *data = get_n (len);
318
319 if (expect_false (len > 1))
320 {
321 U16 mask = (data [0] << 8) | data [1] & 0xff80;
322
323 if (expect_false (mask == 0xff80 || mask == 0x0000))
324 error ("illegal padding in integer (X.690 8.3.2)");
325 }
307 326
308 int negative = data [0] & 0x80; 327 int negative = data [0] & 0x80;
309 328
310 UV val = negative ? -1 : 0; // copy signbit to all bits 329 UV val = negative ? -1 : 0; // copy signbit to all bits
311 330
319} 338}
320 339
321static SV * 340static SV *
322decode_data (void) 341decode_data (void)
323{ 342{
324 U32 len = get_length (); 343 UV len = get_length ();
325 U8 *data = get_n (len);
326 return newSVpvn ((char *)data, len); 344 return newSVpvn ((char *)get_n (len), len);
327} 345}
328 346
329// gelper for decode_object_identifier 347// helper for decode_object_identifier
330static char * 348static char *
331write_uv (char *buf, U32 u) 349write_uv (char *buf, UV u)
332{ 350{
333 // the one-digit case is absolutely predominant, so this pays off (hopefully) 351 // the one-digit case is absolutely predominant, so this pays off (hopefully)
334 if (expect_true (u < 10)) 352 if (expect_true (u < 10))
335 *buf++ = u + '0'; 353 *buf++ = u + '0';
336 else 354 else
337 { 355 {
356 // this *could* be done much faster using branchless fixed-point arithmetics
338 char *beg = buf; 357 char *beg = buf;
339 358
340 do 359 do
341 { 360 {
342 *buf++ = u % 10 + '0'; 361 *buf++ = u % 10 + '0';
343 u /= 10; 362 u /= 10;
344 } 363 }
345 while (u); 364 while (u);
346 365
347 // reverse digits 366 // reverse digits
348 for (char *ptr = buf; --ptr != beg; ++beg) 367 char *ptr = buf;
368 while (--ptr > beg)
349 { 369 {
350 char c = *ptr; 370 char c = *ptr;
351 *ptr = *beg; 371 *ptr = *beg;
352 *beg = c; 372 *beg = c;
373 ++beg;
353 } 374 }
354 } 375 }
355 376
356 return buf; 377 return buf;
357} 378}
358 379
359static SV * 380static SV *
360decode_oid (int relative) 381decode_oid (int relative)
361{ 382{
362 U32 len = get_length (); 383 UV len = get_length ();
363 384
364 if (len <= 0) 385 if (len <= 0)
365 { 386 {
366 error ("OBJECT IDENTIFIER length equal to zero"); 387 error ("OBJECT IDENTIFIER length equal to zero");
367 return &PL_sv_undef; 388 return &PL_sv_undef;
368 } 389 }
369 390
370 U8 *end = cur + len; 391 U8 *end = cur + len;
371 U32 w = get_w (); 392 UV w = get_w ();
372 393
373 static char oid[MAX_OID_STRLEN]; // must be static 394 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack
374 char *app = oid; 395 char *app = oid;
375 396
376 if (relative) 397 if (relative)
377 app = write_uv (app, w); 398 app = write_uv (app, w);
378 else 399 else if (w < 2 * 40)
379 { 400 {
380 app = write_uv (app, (U8)w / 40); 401 app = write_uv (app, (U8)w / 40);
381 *app++ = '.'; 402 *app++ = '.';
382 app = write_uv (app, (U8)w % 40); 403 app = write_uv (app, (U8)w % 40);
383 } 404 }
405 else
406 {
407 app = write_uv (app, 2);
408 *app++ = '.';
409 app = write_uv (app, w - 2 * 40);
410 }
384 411
412 while (cur < end)
413 {
385 // we assume an oid component is never > 64 bytes 414 // we assume an oid component is never > 64 digits
386 while (cur < end && oid + sizeof (oid) - app > 64) 415 if (oid + sizeof (oid) - app < 64)
387 { 416 croak ("BER_TYPE_OID to long to decode");
417
388 w = get_w (); 418 w = get_w ();
389 *app++ = '.'; 419 *app++ = '.';
390 app = write_uv (app, w); 420 app = write_uv (app, w);
391 } 421 }
392 422
397static SV * 427static SV *
398decode_ucs (int chrsize) 428decode_ucs (int chrsize)
399{ 429{
400 SV *res = NEWSV (0, 0); 430 SV *res = NEWSV (0, 0);
401 431
402 U32 len = get_length (); 432 UV len = get_length ();
403 433
404 if (len & (chrsize - 1)) 434 if (len & (chrsize - 1))
405 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len); 435 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
406 436
407 while (len) 437 while (len)
428 458
429 return res; 459 return res;
430} 460}
431 461
432static SV * 462static SV *
433decode_ber () 463decode_ber (void)
434{ 464{
435 int identifier = get_u8 (); 465 int identifier = get_u8 ();
436 466
437 SV *res; 467 SV *res;
438 468
441 int tag = identifier & ASN_TAG_MASK; 471 int tag = identifier & ASN_TAG_MASK;
442 472
443 if (tag == ASN_TAG_BER) 473 if (tag == ASN_TAG_BER)
444 tag = get_w (); 474 tag = get_w ();
445 475
446 if (tag == ASN_TAG_BER)
447 tag = get_w ();
448
449 if (constructed) 476 if (constructed)
450 { 477 {
451 U32 len = get_length (); 478 UV len = get_length ();
452 U32 seqend = (cur - buf) + len; 479 UV seqend = (cur - buf) + len;
453 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 480 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
454 481
455 while (cur < buf + seqend) 482 while (cur < buf + seqend)
456 av_push (av, decode_ber ()); 483 av_push (av, decode_ber ());
457 484
458 if (cur > buf + seqend) 485 if (cur > buf + seqend)
459 croak ("constructed type %02x overflow (%x %x)\n", identifier, cur - buf, seqend); 486 croak ("constructed type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
460 487
461 res = newRV_inc ((SV *)av); 488 res = newRV_inc ((SV *)av);
462 } 489 }
463 else 490 else
464 switch (profile_lookup (cur_profile, klass, tag)) 491 switch (profile_lookup (cur_profile, klass, tag))
465 { 492 {
466 case BER_TYPE_NULL: 493 case BER_TYPE_NULL:
494 {
495 UV len = get_length ();
496
497 if (len)
498 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
499
467 res = &PL_sv_undef; 500 res = &PL_sv_undef;
501 }
468 break; 502 break;
469 503
470 case BER_TYPE_BOOL: 504 case BER_TYPE_BOOL:
471 { 505 {
472 U32 len = get_length (); 506 UV len = get_length ();
473 507
474 if (len != 1) 508 if (len != 1)
475 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len); 509 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
476 510
477 res = newSVcacheint (get_u8 () ? 0 : 1); 511 res = newSVcacheint (!!get_u8 ());
478 } 512 }
479 break; 513 break;
480 514
481 case BER_TYPE_OID: 515 case BER_TYPE_OID:
482 res = decode_oid (0); 516 res = decode_oid (0);
499 res = decode_data (); 533 res = decode_data ();
500 break; 534 break;
501 535
502 case BER_TYPE_IPADDRESS: 536 case BER_TYPE_IPADDRESS:
503 { 537 {
504 U32 len = get_length (); 538 UV len = get_length ();
505 539
506 if (len != 4) 540 if (len != 4)
507 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 541 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
508 542
509 U8 c1 = get_u8 (); 543 U8 c1 = get_u8 ();
510 U8 c2 = get_u8 (); 544 U8 c2 = get_u8 ();
511 U8 c3 = get_u8 (); 545 U8 c3 = get_u8 ();
512 U8 c4 = get_u8 (); 546 U8 c4 = get_u8 ();
529 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 563 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
530 } 564 }
531 565
532 AV *av = newAV (); 566 AV *av = newAV ();
533 av_fill (av, BER_ARRAYSIZE - 1); 567 av_fill (av, BER_ARRAYSIZE - 1);
534 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 568 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
535 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 569 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
536 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 570 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
537 AvARRAY (av)[BER_DATA ] = res; 571 AvARRAY (av)[BER_DATA ] = res;
538 572
539 return newRV_noinc ((SV *)av); 573 return newRV_noinc ((SV *)av);
540} 574}
541 575
542///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
547strlen_sum (STRLEN l1, STRLEN l2) 581strlen_sum (STRLEN l1, STRLEN l2)
548{ 582{
549 size_t sum = l1 + l2; 583 size_t sum = l1 + l2;
550 584
551 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 585 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
552 croak ("JSON::XS: string size overflow"); 586 croak ("Convert::BER::XS: string size overflow");
553 587
554 return sum; 588 return sum;
555} 589}
556 590
557static void 591static void
595 need (1); 629 need (1);
596 *cur++ = val; 630 *cur++ = val;
597} 631}
598 632
599static void 633static void
600put_w_nocheck (U32 val) 634put_w_nocheck (UV val)
601{ 635{
636#if UVSIZE > 4
637 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
638 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
639 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
640 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
641 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
642#endif
602 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 643 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
603 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 644 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
604 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 645 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
605 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 646 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
606 *cur = val & 0x7f; cur += 1; 647 *cur = val & 0x7f; cur += 1;
607} 648}
608 649
609static void 650static void
610put_w (U32 val) 651put_w (UV val)
611{ 652{
612 need (5); // we only handle up to 5 bytes 653 need (5); // we only handle up to 5 bytes
613 654
614 put_w_nocheck (val); 655 put_w_nocheck (val);
615} 656}
616 657
617static U8 * 658static U8 *
618put_length_at (U32 val, U8 *cur) 659put_length_at (UV val, U8 *cur)
619{ 660{
620 if (val < 0x7fU) 661 if (val < 0x7fU)
621 *cur++ = val; 662 *cur++ = val;
622 else 663 else
623 { 664 {
624 U8 *lenb = cur++; 665 U8 *lenb = cur++;
625 666
667#if UVSIZE > 4
668 *cur = val >> 56; cur += *cur > 0;
669 *cur = val >> 48; cur += *cur > 0;
670 *cur = val >> 40; cur += *cur > 0;
671 *cur = val >> 32; cur += *cur > 0;
672#endif
626 *cur = val >> 24; cur += *cur > 0; 673 *cur = val >> 24; cur += *cur > 0;
627 *cur = val >> 16; cur += *cur > 0; 674 *cur = val >> 16; cur += *cur > 0;
628 *cur = val >> 8; cur += *cur > 0; 675 *cur = val >> 8; cur += *cur > 0;
629 *cur = val ; cur += 1; 676 *cur = val ; cur += 1;
630 677
633 680
634 return cur; 681 return cur;
635} 682}
636 683
637static void 684static void
638put_length (U32 val) 685put_length (UV val)
639{ 686{
640 need (5 + val); 687 need (5 + val);
641 cur = put_length_at (val, cur); 688 cur = put_length_at (val, cur);
642} 689}
643 690
644// return how many bytes the encoded length requires 691// return how many bytes the encoded length requires
645static int length_length (U32 val) 692static int length_length (UV val)
646{ 693{
647 return val < 0x7fU 694 return val < 0x7fU
648 ? 1 695 ? 1
649 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 696 : 2
697 + (val > 0xffU)
698 + (val > 0xffffU)
699 + (val > 0xffffffU)
700#if UVSIZE > 4
701 + (val > 0xffffffffU)
702 + (val > 0xffffffffffU)
703 + (val > 0xffffffffffffU)
704 + (val > 0xffffffffffffffU)
705#endif
706 ;
650} 707}
651 708
652static void 709static void
653encode_data (const char *ptr, STRLEN len) 710encode_data (const char *ptr, STRLEN len)
654{ 711{
716 773
717 *lenb = cur - lenb - 1; 774 *lenb = cur - lenb - 1;
718} 775}
719 776
720// we don't know the length yet, so we optimistically 777// we don't know the length yet, so we optimistically
721// assume the length will need one octet later. if that 778// assume the length will need one octet later. If that
722// turns out to be wrong, we memove as needed. 779// turns out to be wrong, we memmove as needed.
723// mark the beginning 780// mark the beginning
724static STRLEN 781static STRLEN
725len_fixup_mark () 782len_fixup_mark (void)
726{ 783{
727 return cur++ - buf; 784 return cur++ - buf;
728} 785}
729 786
730// patch up the length 787// patch up the length
839{ 896{
840 AV *av = ber_tuple (tuple); 897 AV *av = ber_tuple (tuple);
841 898
842 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 899 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
843 int tag = SvIV (AvARRAY (av)[BER_TAG]); 900 int tag = SvIV (AvARRAY (av)[BER_TAG]);
844 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 901 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
845 SV *data = AvARRAY (av)[BER_DATA]; 902 SV *data = AvARRAY (av)[BER_DATA];
846 903
847 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 904 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
848 905
849 if (expect_false (tag >= ASN_TAG_BER)) 906 if (expect_false (tag >= ASN_TAG_BER))
868 int fill = AvFILL (av); 925 int fill = AvFILL (av);
869 926
870 if (expect_false (SvRMAGICAL (av))) 927 if (expect_false (SvRMAGICAL (av)))
871 croak ("BER constructed data must not be tied"); 928 croak ("BER constructed data must not be tied");
872 929
930 int i;
873 for (int i = 0; i <= fill; ++i) 931 for (i = 0; i <= fill; ++i)
874 encode_ber (AvARRAY (av)[i]); 932 encode_ber (AvARRAY (av)[i]);
875 933
876 len_fixup (mark); 934 len_fixup (mark);
877 } 935 }
878 else 936 else
882 put_length (0); 940 put_length (0);
883 break; 941 break;
884 942
885 case BER_TYPE_BOOL: 943 case BER_TYPE_BOOL:
886 put_length (1); 944 put_length (1);
887 *cur++ = SvTRUE (data) ? 0xff : 0x00; 945 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
888 break; 946 break;
889 947
890 case BER_TYPE_OID: 948 case BER_TYPE_OID:
891 encode_oid (data, 0); 949 encode_oid (data, 0);
892 break; 950 break;
955 const char *name; 1013 const char *name;
956 IV iv; 1014 IV iv;
957 } *civ, const_iv[] = { 1015 } *civ, const_iv[] = {
958#define const_iv(name) { # name, name }, 1016#define const_iv(name) { # name, name },
959 const_iv (ASN_BOOLEAN) 1017 const_iv (ASN_BOOLEAN)
960 const_iv (ASN_INTEGER32) 1018 const_iv (ASN_INTEGER)
961 const_iv (ASN_BIT_STRING) 1019 const_iv (ASN_BIT_STRING)
962 const_iv (ASN_OCTET_STRING) 1020 const_iv (ASN_OCTET_STRING)
963 const_iv (ASN_NULL) 1021 const_iv (ASN_NULL)
964 const_iv (ASN_OBJECT_IDENTIFIER) 1022 const_iv (ASN_OBJECT_IDENTIFIER)
965 const_iv (ASN_OBJECT_DESCRIPTOR) 1023 const_iv (ASN_OBJECT_DESCRIPTOR)
994 const_iv (ASN_CONTEXT) 1052 const_iv (ASN_CONTEXT)
995 const_iv (ASN_PRIVATE) 1053 const_iv (ASN_PRIVATE)
996 1054
997 const_iv (BER_CLASS) 1055 const_iv (BER_CLASS)
998 const_iv (BER_TAG) 1056 const_iv (BER_TAG)
999 const_iv (BER_CONSTRUCTED) 1057 const_iv (BER_FLAGS)
1000 const_iv (BER_DATA) 1058 const_iv (BER_DATA)
1001 1059
1002 const_iv (BER_TYPE_BYTES) 1060 const_iv (BER_TYPE_BYTES)
1003 const_iv (BER_TYPE_UTF8) 1061 const_iv (BER_TYPE_UTF8)
1004 const_iv (BER_TYPE_UCS2) 1062 const_iv (BER_TYPE_UCS2)
1012 const_iv (BER_TYPE_IPADDRESS) 1070 const_iv (BER_TYPE_IPADDRESS)
1013 const_iv (BER_TYPE_CROAK) 1071 const_iv (BER_TYPE_CROAK)
1014 1072
1015 const_iv (SNMP_IPADDRESS) 1073 const_iv (SNMP_IPADDRESS)
1016 const_iv (SNMP_COUNTER32) 1074 const_iv (SNMP_COUNTER32)
1075 const_iv (SNMP_GAUGE32)
1017 const_iv (SNMP_UNSIGNED32) 1076 const_iv (SNMP_UNSIGNED32)
1018 const_iv (SNMP_TIMETICKS) 1077 const_iv (SNMP_TIMETICKS)
1019 const_iv (SNMP_OPAQUE) 1078 const_iv (SNMP_OPAQUE)
1020 const_iv (SNMP_COUNTER64) 1079 const_iv (SNMP_COUNTER64)
1021 }; 1080 };
1022 1081
1023 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) 1082 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
1024 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1083 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1025} 1084}
1026 1085
1027SV * 1086void
1028ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1087ber_decode (SV *ber, SV *profile = &PL_sv_undef)
1088 ALIAS:
1089 ber_decode_prefix = 1
1029 CODE: 1090 PPCODE:
1030{ 1091{
1031 cur_profile = SvPROFILE (profile); 1092 cur_profile = SvPROFILE (profile);
1032 STRLEN len; 1093 STRLEN len;
1033 buf = (U8 *)SvPVbyte (ber, len); 1094 buf = (U8 *)SvPVbyte (ber, len);
1034 cur = buf; 1095 cur = buf;
1035 end = buf + len; 1096 end = buf + len;
1036 1097
1037 RETVAL = decode_ber (); 1098 SV *tuple = decode_ber ();
1099
1100 EXTEND (SP, 2);
1101 PUSHs (sv_2mortal (tuple));
1102
1103 if (ix)
1104 PUSHs (sv_2mortal (newSViv (cur - buf)));
1105 else if (cur != end)
1106 error ("trailing garbage after BER data");
1038} 1107}
1039 OUTPUT: RETVAL
1040 1108
1041void 1109void
1042ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &PL_sv_undef, SV *data = &PL_sv_undef) 1110ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *flags = &PL_sv_undef, SV *data = &PL_sv_undef)
1043 PPCODE: 1111 PPCODE:
1044{ 1112{
1045 if (!SvOK (tuple)) 1113 if (!SvOK (tuple))
1046 XSRETURN_NO; 1114 XSRETURN_NO;
1047 1115
1049 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1117 croak ("ber_is: tuple must be BER tuple (array-ref)");
1050 1118
1051 AV *av = (AV *)SvRV (tuple); 1119 AV *av = (AV *)SvRV (tuple);
1052 1120
1053 XPUSHs ( 1121 XPUSHs (
1054 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1122 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1055 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1123 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1056 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1124 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1057 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1125 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1058 ? &PL_sv_yes : &PL_sv_undef); 1126 ? &PL_sv_yes : &PL_sv_undef);
1059} 1127}
1060 1128
1061void 1129void
1062ber_is_seq (SV *tuple) 1130ber_is_seq (SV *tuple)
1066 XSRETURN_UNDEF; 1134 XSRETURN_UNDEF;
1067 1135
1068 AV *av = ber_tuple (tuple); 1136 AV *av = ber_tuple (tuple);
1069 1137
1070 XPUSHs ( 1138 XPUSHs (
1071 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1139 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1072 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1140 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1073 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1141 && SvIV (AvARRAY (av)[BER_FLAGS])
1074 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1142 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1075} 1143}
1076 1144
1077void 1145void
1078ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1146ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1079 PPCODE: 1147 PPCODE:
1080{ 1148{
1081 if (!SvOK (tuple)) 1149 if (!SvOK (tuple))
1082 XSRETURN_NO; 1150 XSRETURN_NO;
1083 1151
1084 AV *av = ber_tuple (tuple); 1152 AV *av = ber_tuple (tuple);
1085 1153
1086 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1154 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1087 1155
1088 XPUSHs ( 1156 XPUSHs (
1089 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1157 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1090 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1158 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1091 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1159 && !SvIV (AvARRAY (av)[BER_FLAGS])
1092 && (!SvOK (value) || data == SvIV (value)) 1160 && (!SvOK (value) || data == SvUV (value))
1093 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1161 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1094 : &PL_sv_undef); 1162 : &PL_sv_undef);
1095} 1163}
1096 1164
1097void 1165void
1098ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1166ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
1102 XSRETURN_NO; 1170 XSRETURN_NO;
1103 1171
1104 AV *av = ber_tuple (tuple); 1172 AV *av = ber_tuple (tuple);
1105 1173
1106 XPUSHs ( 1174 XPUSHs (
1107 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1175 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1108 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1176 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1109 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1177 && !SvIV (AvARRAY (av)[BER_FLAGS])
1110 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1178 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1111 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1179 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1112} 1180}
1113 1181
1114############################################################################# 1182#############################################################################
1127 SvCUR_set (buf_sv, cur - buf); 1195 SvCUR_set (buf_sv, cur - buf);
1128 XPUSHs (buf_sv); 1196 XPUSHs (buf_sv);
1129} 1197}
1130 1198
1131SV * 1199SV *
1132ber_i32 (IV iv) 1200ber_int (SV *sv)
1133 CODE: 1201 CODE:
1134{ 1202{
1135 AV *av = newAV (); 1203 AV *av = newAV ();
1136 av_fill (av, BER_ARRAYSIZE - 1); 1204 av_fill (av, BER_ARRAYSIZE - 1);
1137 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1205 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1138 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1206 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1139 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1207 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1140 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1208 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1141 RETVAL = newRV_noinc ((SV *)av); 1209 RETVAL = newRV_noinc ((SV *)av);
1142} 1210}
1143 OUTPUT: RETVAL 1211 OUTPUT: RETVAL
1144 1212
1145# TODO: not arrayref, but elements? 1213# TODO: not arrayref, but elements?
1147ber_seq (SV *arrayref) 1215ber_seq (SV *arrayref)
1148 CODE: 1216 CODE:
1149{ 1217{
1150 AV *av = newAV (); 1218 AV *av = newAV ();
1151 av_fill (av, BER_ARRAYSIZE - 1); 1219 av_fill (av, BER_ARRAYSIZE - 1);
1152 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1220 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1153 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1221 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1154 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1222 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1155 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1223 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1156 RETVAL = newRV_noinc ((SV *)av); 1224 RETVAL = newRV_noinc ((SV *)av);
1157} 1225}
1158 OUTPUT: RETVAL 1226 OUTPUT: RETVAL
1159 1227
1160MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1228MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines