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.20 by root, Sat Apr 20 17:04:35 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,
80 BER_TYPE_IPADDRESS, 80 BER_TYPE_IPADDRESS,
81 BER_TYPE_CROAK, 81 BER_TYPE_CROAK,
82}; 82};
83 83
84enum { 84enum {
85 BER_CLASS = 0, 85 BER_CLASS = 0,
86 BER_TAG = 1, 86 BER_TAG = 1,
87 BER_CONSTRUCTED = 2, 87 BER_FLAGS = 2,
88 BER_DATA = 3, 88 BER_DATA = 3,
89 BER_ARRAYSIZE 89 BER_ARRAYSIZE
90}; 90};
91 91
92#define MAX_OID_STRLEN 4096 92#define MAX_OID_STRLEN 4096
93 93
181 181
182 SvPVX (sv)[idx] = type; 182 SvPVX (sv)[idx] = type;
183} 183}
184 184
185static SV * 185static SV *
186profile_new () 186profile_new (void)
187{ 187{
188 SV *sv = newSVpvn ("", 0); 188 SV *sv = newSVpvn ("", 0);
189 189
190 static const struct { 190 static const struct {
191 int klass; 191 int klass;
192 int tag; 192 int tag;
193 int type; 193 int type;
194 } *celem, default_map[] = { 194 } *celem, default_map[] = {
195 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL }, 195 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },
196 { ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT }, 196 { ASN_UNIVERSAL, ASN_INTEGER , BER_TYPE_INT },
197 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL }, 197 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },
198 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID }, 198 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID },
199 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID }, 199 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
200 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL }, 200 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
201 { ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT }, 201 { ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
248 248
249 return *cur++; 249 return *cur++;
250} 250}
251 251
252// get ber-encoded integer (i.e. pack "w") 252// get ber-encoded integer (i.e. pack "w")
253static U32 253static UV
254get_w (void) 254get_w (void)
255{ 255{
256 U32 res = 0; 256 UV res = 0;
257 U8 c = get_u8 ();
258
259 if (expect_false (c == 0x80))
260 error ("illegal BER padding (X.690 8.1.2.4.2, 8.19.2)");
257 261
258 for (;;) 262 for (;;)
259 { 263 {
260 U8 c = get_u8 ();
261 res = (res << 7) | (c & 0x7f); 264 res = (res << 7) | (c & 0x7f);
262 265
263 if (!(c & 0x80)) 266 if (!(c & 0x80))
264 return res; 267 return res;
265 }
266}
267 268
269 c = get_u8 ();
270 }
271}
272
268static U32 273static UV
269get_length (void) 274get_length (void)
270{ 275{
271 U32 res = get_u8 (); 276 UV res = get_u8 ();
272 277
273 if (res & 0x80) 278 if (res & 0x80)
274 { 279 {
275 int cnt = res & 0x7f; 280 int cnt = res & 0x7f;
276 res = 0; 281 res = 0;
277 282
278 switch (cnt) 283 switch (cnt)
279 { 284 {
280 case 0: 285 case 0:
281 error ("indefinite ASN.1 lengths not supported"); 286 error ("indefinite ASN.1 lengths not supported");
282 return 0; 287
288 case 0x7f:
289 error ("ASN.1 reserved value in length (X.690 8.1.3.5)");
283 290
284 default: 291 default:
285 error ("ASN.1 length too long"); 292 error ("ASN.1 length too long (only up to 2**64 octets supported)");
286 return 0;
287 293
294 case 8: res = (res << 8) | get_u8 ();
295 case 7: res = (res << 8) | get_u8 ();
296 case 6: res = (res << 8) | get_u8 ();
297 case 5: res = (res << 8) | get_u8 ();
288 case 4: res = (res << 8) | get_u8 (); 298 case 4: res = (res << 8) | get_u8 ();
289 case 3: res = (res << 8) | get_u8 (); 299 case 3: res = (res << 8) | get_u8 ();
290 case 2: res = (res << 8) | get_u8 (); 300 case 2: res = (res << 8) | get_u8 ();
291 case 1: res = (res << 8) | get_u8 (); 301 case 1: res = (res << 8) | get_u8 ();
292 } 302 }
294 304
295 return res; 305 return res;
296} 306}
297 307
298static SV * 308static SV *
299decode_int () 309decode_int (void)
300{ 310{
301 int len = get_length (); 311 UV len = get_length ();
302 312
303 if (len <= 0) 313 if (!len)
304 {
305 error ("integer length equal to zero"); 314 error ("invalid integer length equal to zero (X.690 8.3.1)");
306 return 0;
307 }
308 315
309 U8 *data = get_n (len); 316 U8 *data = get_n (len);
317
318 if (expect_false (len > 1))
319 {
320 U16 mask = (data [0] << 8) | data [1] & 0xff80;
321
322 if (expect_false (mask == 0xff80 || mask == 0x0000))
323 error ("illegal padding in integer (X.690 8.3.2)");
324 }
310 325
311 int negative = data [0] & 0x80; 326 int negative = data [0] & 0x80;
312 327
313 UV val = negative ? -1 : 0; // copy signbit to all bits 328 UV val = negative ? -1 : 0; // copy signbit to all bits
314 329
322} 337}
323 338
324static SV * 339static SV *
325decode_data (void) 340decode_data (void)
326{ 341{
327 U32 len = get_length (); 342 UV len = get_length ();
328 U8 *data = get_n (len);
329 return newSVpvn ((char *)data, len); 343 return newSVpvn ((char *)get_n (len), len);
330} 344}
331 345
332// gelper for decode_object_identifier 346// helper for decode_object_identifier
333static char * 347static char *
334write_uv (char *buf, U32 u) 348write_uv (char *buf, UV u)
335{ 349{
336 // the one-digit case is absolutely predominant, so this pays off (hopefully) 350 // the one-digit case is absolutely predominant, so this pays off (hopefully)
337 if (expect_true (u < 10)) 351 if (expect_true (u < 10))
338 *buf++ = u + '0'; 352 *buf++ = u + '0';
339 else 353 else
340 { 354 {
341 // this *could* be done much faster using branchless fixed-ppint arithmetics 355 // this *could* be done much faster using branchless fixed-point arithmetics
342 char *beg = buf; 356 char *beg = buf;
343 357
344 do 358 do
345 { 359 {
346 *buf++ = u % 10 + '0'; 360 *buf++ = u % 10 + '0';
363} 377}
364 378
365static SV * 379static SV *
366decode_oid (int relative) 380decode_oid (int relative)
367{ 381{
368 U32 len = get_length (); 382 UV len = get_length ();
369 383
370 if (len <= 0) 384 if (len <= 0)
371 { 385 {
372 error ("OBJECT IDENTIFIER length equal to zero"); 386 error ("OBJECT IDENTIFIER length equal to zero");
373 return &PL_sv_undef; 387 return &PL_sv_undef;
374 } 388 }
375 389
376 U8 *end = cur + len; 390 U8 *end = cur + len;
377 U32 w = get_w (); 391 UV w = get_w ();
378 392
379 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack 393 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack
380 char *app = oid; 394 char *app = oid;
381 395
382 if (relative) 396 if (relative)
383 app = write_uv (app, w); 397 app = write_uv (app, w);
384 else 398 else if (w < 2 * 40)
385 { 399 {
386 app = write_uv (app, (U8)w / 40); 400 app = write_uv (app, (U8)w / 40);
387 *app++ = '.'; 401 *app++ = '.';
388 app = write_uv (app, (U8)w % 40); 402 app = write_uv (app, (U8)w % 40);
389 } 403 }
404 else
405 {
406 app = write_uv (app, 2);
407 *app++ = '.';
408 app = write_uv (app, w - 2 * 40);
409 }
390 410
391 while (cur < end) 411 while (cur < end)
392 { 412 {
393 // we assume an oid component is never > 64 digits 413 // we assume an oid component is never > 64 digits
394 if (oid + sizeof (oid) - app < 64) 414 if (oid + sizeof (oid) - app < 64)
406static SV * 426static SV *
407decode_ucs (int chrsize) 427decode_ucs (int chrsize)
408{ 428{
409 SV *res = NEWSV (0, 0); 429 SV *res = NEWSV (0, 0);
410 430
411 U32 len = get_length (); 431 UV len = get_length ();
412 432
413 if (len & (chrsize - 1)) 433 if (len & (chrsize - 1))
414 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len); 434 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
415 435
416 while (len) 436 while (len)
437 457
438 return res; 458 return res;
439} 459}
440 460
441static SV * 461static SV *
442decode_ber () 462decode_ber (void)
443{ 463{
444 int identifier = get_u8 (); 464 int identifier = get_u8 ();
445 465
446 SV *res; 466 SV *res;
447 467
450 int tag = identifier & ASN_TAG_MASK; 470 int tag = identifier & ASN_TAG_MASK;
451 471
452 if (tag == ASN_TAG_BER) 472 if (tag == ASN_TAG_BER)
453 tag = get_w (); 473 tag = get_w ();
454 474
455 if (tag == ASN_TAG_BER)
456 tag = get_w ();
457
458 if (constructed) 475 if (constructed)
459 { 476 {
460 U32 len = get_length (); 477 UV len = get_length ();
461 U32 seqend = (cur - buf) + len; 478 UV seqend = (cur - buf) + len;
462 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 479 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
463 480
464 while (cur < buf + seqend) 481 while (cur < buf + seqend)
465 av_push (av, decode_ber ()); 482 av_push (av, decode_ber ());
466 483
467 if (cur > buf + seqend) 484 if (cur > buf + seqend)
468 croak ("constructed type %02x overflow (%x %x)\n", identifier, cur - buf, seqend); 485 croak ("constructed type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
469 486
470 res = newRV_inc ((SV *)av); 487 res = newRV_inc ((SV *)av);
471 } 488 }
472 else 489 else
473 switch (profile_lookup (cur_profile, klass, tag)) 490 switch (profile_lookup (cur_profile, klass, tag))
474 { 491 {
475 case BER_TYPE_NULL: 492 case BER_TYPE_NULL:
476 { 493 {
477 U32 len = get_length (); 494 UV len = get_length ();
478 495
479 if (len) 496 if (len)
480 croak ("BER_TYPE_NULL value with non-zero length %d encountered", len); 497 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
481 498
482 res = &PL_sv_undef; 499 res = &PL_sv_undef;
483 } 500 }
484 break; 501 break;
485 502
486 case BER_TYPE_BOOL: 503 case BER_TYPE_BOOL:
487 { 504 {
488 U32 len = get_length (); 505 UV len = get_length ();
489 506
490 if (len != 1) 507 if (len != 1)
491 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len); 508 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
492 509
493 res = newSVcacheint (!!get_u8 ()); 510 res = newSVcacheint (!!get_u8 ());
494 } 511 }
495 break; 512 break;
496 513
515 res = decode_data (); 532 res = decode_data ();
516 break; 533 break;
517 534
518 case BER_TYPE_IPADDRESS: 535 case BER_TYPE_IPADDRESS:
519 { 536 {
520 U32 len = get_length (); 537 UV len = get_length ();
521 538
522 if (len != 4) 539 if (len != 4)
523 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 540 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
524 541
525 U8 c1 = get_u8 (); 542 U8 c1 = get_u8 ();
526 U8 c2 = get_u8 (); 543 U8 c2 = get_u8 ();
527 U8 c3 = get_u8 (); 544 U8 c3 = get_u8 ();
528 U8 c4 = get_u8 (); 545 U8 c4 = get_u8 ();
545 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 562 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
546 } 563 }
547 564
548 AV *av = newAV (); 565 AV *av = newAV ();
549 av_fill (av, BER_ARRAYSIZE - 1); 566 av_fill (av, BER_ARRAYSIZE - 1);
550 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 567 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
551 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 568 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
552 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 569 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
553 AvARRAY (av)[BER_DATA ] = res; 570 AvARRAY (av)[BER_DATA ] = res;
554 571
555 return newRV_noinc ((SV *)av); 572 return newRV_noinc ((SV *)av);
556} 573}
557 574
558///////////////////////////////////////////////////////////////////////////// 575/////////////////////////////////////////////////////////////////////////////
563strlen_sum (STRLEN l1, STRLEN l2) 580strlen_sum (STRLEN l1, STRLEN l2)
564{ 581{
565 size_t sum = l1 + l2; 582 size_t sum = l1 + l2;
566 583
567 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 584 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
568 croak ("JSON::XS: string size overflow"); 585 croak ("Convert::BER::XS: string size overflow");
569 586
570 return sum; 587 return sum;
571} 588}
572 589
573static void 590static void
611 need (1); 628 need (1);
612 *cur++ = val; 629 *cur++ = val;
613} 630}
614 631
615static void 632static void
616put_w_nocheck (U32 val) 633put_w_nocheck (UV val)
617{ 634{
635#if UVSIZE > 4
636 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
637 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
638 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
639 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
640 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
641#endif
618 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 642 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
619 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 643 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
620 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 644 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
621 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 645 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
622 *cur = val & 0x7f; cur += 1; 646 *cur = val & 0x7f; cur += 1;
623} 647}
624 648
625static void 649static void
626put_w (U32 val) 650put_w (UV val)
627{ 651{
628 need (5); // we only handle up to 5 bytes 652 need (5); // we only handle up to 5 bytes
629 653
630 put_w_nocheck (val); 654 put_w_nocheck (val);
631} 655}
632 656
633static U8 * 657static U8 *
634put_length_at (U32 val, U8 *cur) 658put_length_at (UV val, U8 *cur)
635{ 659{
636 if (val < 0x7fU) 660 if (val < 0x7fU)
637 *cur++ = val; 661 *cur++ = val;
638 else 662 else
639 { 663 {
640 U8 *lenb = cur++; 664 U8 *lenb = cur++;
641 665
666#if UVSIZE > 4
667 *cur = val >> 56; cur += *cur > 0;
668 *cur = val >> 48; cur += *cur > 0;
669 *cur = val >> 40; cur += *cur > 0;
670 *cur = val >> 32; cur += *cur > 0;
671#endif
642 *cur = val >> 24; cur += *cur > 0; 672 *cur = val >> 24; cur += *cur > 0;
643 *cur = val >> 16; cur += *cur > 0; 673 *cur = val >> 16; cur += *cur > 0;
644 *cur = val >> 8; cur += *cur > 0; 674 *cur = val >> 8; cur += *cur > 0;
645 *cur = val ; cur += 1; 675 *cur = val ; cur += 1;
646 676
649 679
650 return cur; 680 return cur;
651} 681}
652 682
653static void 683static void
654put_length (U32 val) 684put_length (UV val)
655{ 685{
656 need (5 + val); 686 need (5 + val);
657 cur = put_length_at (val, cur); 687 cur = put_length_at (val, cur);
658} 688}
659 689
660// return how many bytes the encoded length requires 690// return how many bytes the encoded length requires
661static int length_length (U32 val) 691static int length_length (UV val)
662{ 692{
663 return val < 0x7fU 693 return val < 0x7fU
664 ? 1 694 ? 1
665 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 695 : 2
696 + (val > 0xffU)
697 + (val > 0xffffU)
698 + (val > 0xffffffU)
699#if UVSIZE > 4
700 + (val > 0xffffffffU)
701 + (val > 0xffffffffffU)
702 + (val > 0xffffffffffffU)
703 + (val > 0xffffffffffffffU)
704#endif
705 ;
666} 706}
667 707
668static void 708static void
669encode_data (const char *ptr, STRLEN len) 709encode_data (const char *ptr, STRLEN len)
670{ 710{
732 772
733 *lenb = cur - lenb - 1; 773 *lenb = cur - lenb - 1;
734} 774}
735 775
736// we don't know the length yet, so we optimistically 776// we don't know the length yet, so we optimistically
737// assume the length will need one octet later. if that 777// assume the length will need one octet later. If that
738// turns out to be wrong, we memove as needed. 778// turns out to be wrong, we memmove as needed.
739// mark the beginning 779// mark the beginning
740static STRLEN 780static STRLEN
741len_fixup_mark () 781len_fixup_mark (void)
742{ 782{
743 return cur++ - buf; 783 return cur++ - buf;
744} 784}
745 785
746// patch up the length 786// patch up the length
855{ 895{
856 AV *av = ber_tuple (tuple); 896 AV *av = ber_tuple (tuple);
857 897
858 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 898 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
859 int tag = SvIV (AvARRAY (av)[BER_TAG]); 899 int tag = SvIV (AvARRAY (av)[BER_TAG]);
860 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 900 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
861 SV *data = AvARRAY (av)[BER_DATA]; 901 SV *data = AvARRAY (av)[BER_DATA];
862 902
863 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 903 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
864 904
865 if (expect_false (tag >= ASN_TAG_BER)) 905 if (expect_false (tag >= ASN_TAG_BER))
899 put_length (0); 939 put_length (0);
900 break; 940 break;
901 941
902 case BER_TYPE_BOOL: 942 case BER_TYPE_BOOL:
903 put_length (1); 943 put_length (1);
904 *cur++ = SvTRUE (data) ? 0xff : 0x00; 944 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
905 break; 945 break;
906 946
907 case BER_TYPE_OID: 947 case BER_TYPE_OID:
908 encode_oid (data, 0); 948 encode_oid (data, 0);
909 break; 949 break;
972 const char *name; 1012 const char *name;
973 IV iv; 1013 IV iv;
974 } *civ, const_iv[] = { 1014 } *civ, const_iv[] = {
975#define const_iv(name) { # name, name }, 1015#define const_iv(name) { # name, name },
976 const_iv (ASN_BOOLEAN) 1016 const_iv (ASN_BOOLEAN)
977 const_iv (ASN_INTEGER32) 1017 const_iv (ASN_INTEGER)
978 const_iv (ASN_BIT_STRING) 1018 const_iv (ASN_BIT_STRING)
979 const_iv (ASN_OCTET_STRING) 1019 const_iv (ASN_OCTET_STRING)
980 const_iv (ASN_NULL) 1020 const_iv (ASN_NULL)
981 const_iv (ASN_OBJECT_IDENTIFIER) 1021 const_iv (ASN_OBJECT_IDENTIFIER)
982 const_iv (ASN_OBJECT_DESCRIPTOR) 1022 const_iv (ASN_OBJECT_DESCRIPTOR)
1011 const_iv (ASN_CONTEXT) 1051 const_iv (ASN_CONTEXT)
1012 const_iv (ASN_PRIVATE) 1052 const_iv (ASN_PRIVATE)
1013 1053
1014 const_iv (BER_CLASS) 1054 const_iv (BER_CLASS)
1015 const_iv (BER_TAG) 1055 const_iv (BER_TAG)
1016 const_iv (BER_CONSTRUCTED) 1056 const_iv (BER_FLAGS)
1017 const_iv (BER_DATA) 1057 const_iv (BER_DATA)
1018 1058
1019 const_iv (BER_TYPE_BYTES) 1059 const_iv (BER_TYPE_BYTES)
1020 const_iv (BER_TYPE_UTF8) 1060 const_iv (BER_TYPE_UTF8)
1021 const_iv (BER_TYPE_UCS2) 1061 const_iv (BER_TYPE_UCS2)
1054 RETVAL = decode_ber (); 1094 RETVAL = decode_ber ();
1055} 1095}
1056 OUTPUT: RETVAL 1096 OUTPUT: RETVAL
1057 1097
1058void 1098void
1059ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &PL_sv_undef, SV *data = &PL_sv_undef) 1099ber_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: 1100 PPCODE:
1061{ 1101{
1062 if (!SvOK (tuple)) 1102 if (!SvOK (tuple))
1063 XSRETURN_NO; 1103 XSRETURN_NO;
1064 1104
1066 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1106 croak ("ber_is: tuple must be BER tuple (array-ref)");
1067 1107
1068 AV *av = (AV *)SvRV (tuple); 1108 AV *av = (AV *)SvRV (tuple);
1069 1109
1070 XPUSHs ( 1110 XPUSHs (
1071 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1111 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1072 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1112 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1073 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1113 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1074 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1114 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1075 ? &PL_sv_yes : &PL_sv_undef); 1115 ? &PL_sv_yes : &PL_sv_undef);
1076} 1116}
1077 1117
1078void 1118void
1079ber_is_seq (SV *tuple) 1119ber_is_seq (SV *tuple)
1083 XSRETURN_UNDEF; 1123 XSRETURN_UNDEF;
1084 1124
1085 AV *av = ber_tuple (tuple); 1125 AV *av = ber_tuple (tuple);
1086 1126
1087 XPUSHs ( 1127 XPUSHs (
1088 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1128 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1089 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1129 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1090 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1130 && SvIV (AvARRAY (av)[BER_FLAGS])
1091 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1131 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1092} 1132}
1093 1133
1094void 1134void
1095ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1135ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1096 PPCODE: 1136 PPCODE:
1097{ 1137{
1098 if (!SvOK (tuple)) 1138 if (!SvOK (tuple))
1099 XSRETURN_NO; 1139 XSRETURN_NO;
1100 1140
1101 AV *av = ber_tuple (tuple); 1141 AV *av = ber_tuple (tuple);
1102 1142
1103 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1143 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1104 1144
1105 XPUSHs ( 1145 XPUSHs (
1106 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1146 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1107 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1147 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1108 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1148 && !SvIV (AvARRAY (av)[BER_FLAGS])
1109 && (!SvOK (value) || data == SvIV (value)) 1149 && (!SvOK (value) || data == SvUV (value))
1110 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1150 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1111 : &PL_sv_undef); 1151 : &PL_sv_undef);
1112} 1152}
1113 1153
1114void 1154void
1115ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1155ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
1119 XSRETURN_NO; 1159 XSRETURN_NO;
1120 1160
1121 AV *av = ber_tuple (tuple); 1161 AV *av = ber_tuple (tuple);
1122 1162
1123 XPUSHs ( 1163 XPUSHs (
1124 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1164 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1125 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1165 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1126 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1166 && !SvIV (AvARRAY (av)[BER_FLAGS])
1127 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1167 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1128 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1168 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1129} 1169}
1130 1170
1131############################################################################# 1171#############################################################################
1144 SvCUR_set (buf_sv, cur - buf); 1184 SvCUR_set (buf_sv, cur - buf);
1145 XPUSHs (buf_sv); 1185 XPUSHs (buf_sv);
1146} 1186}
1147 1187
1148SV * 1188SV *
1149ber_i32 (IV iv) 1189ber_int (SV *sv)
1150 CODE: 1190 CODE:
1151{ 1191{
1152 AV *av = newAV (); 1192 AV *av = newAV ();
1153 av_fill (av, BER_ARRAYSIZE - 1); 1193 av_fill (av, BER_ARRAYSIZE - 1);
1154 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1194 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1155 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1195 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1156 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1196 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1157 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1197 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1158 RETVAL = newRV_noinc ((SV *)av); 1198 RETVAL = newRV_noinc ((SV *)av);
1159} 1199}
1160 OUTPUT: RETVAL 1200 OUTPUT: RETVAL
1161 1201
1162# TODO: not arrayref, but elements? 1202# TODO: not arrayref, but elements?
1164ber_seq (SV *arrayref) 1204ber_seq (SV *arrayref)
1165 CODE: 1205 CODE:
1166{ 1206{
1167 AV *av = newAV (); 1207 AV *av = newAV ();
1168 av_fill (av, BER_ARRAYSIZE - 1); 1208 av_fill (av, BER_ARRAYSIZE - 1);
1169 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1209 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1170 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1210 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1171 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1211 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1172 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1212 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1173 RETVAL = newRV_noinc ((SV *)av); 1213 RETVAL = newRV_noinc ((SV *)av);
1174} 1214}
1175 OUTPUT: RETVAL 1215 OUTPUT: RETVAL
1176 1216
1177MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1217MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines