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.18 by root, Sat Apr 20 16:12:53 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 257
258 for (;;) 258 for (;;)
259 { 259 {
260 U8 c = get_u8 (); 260 U8 c = get_u8 ();
261 res = (res << 7) | (c & 0x7f); 261 res = (res << 7) | (c & 0x7f);
… …
263 if (!(c & 0x80)) 263 if (!(c & 0x80))
264 return res; 264 return res;
265 } 265 }
266} 266}
267 267
268static U32 268static UV
269get_length (void) 269get_length (void)
270{ 270{
271 U32 res = get_u8 (); 271 UV res = get_u8 ();
272 272
273 if (res & 0x80) 273 if (res & 0x80)
274 { 274 {
275 int cnt = res & 0x7f; 275 int cnt = res & 0x7f;
276 res = 0; 276 res = 0;
… …
279 { 279 {
280 case 0: 280 case 0:
281 error ("indefinite ASN.1 lengths not supported"); 281 error ("indefinite ASN.1 lengths not supported");
282 return 0; 282 return 0;
283 283
284 //case 0x80: // indefinite length
285
286 //case 0xff: reserved
284 default: 287 default:
285 error ("ASN.1 length too long"); 288 error ("ASN.1 length too long");
286 return 0; 289 return 0;
287 290
291 case 8: res = (res << 8) | get_u8 ();
292 case 7: res = (res << 8) | get_u8 ();
293 case 6: res = (res << 8) | get_u8 ();
294 case 5: res = (res << 8) | get_u8 ();
288 case 4: res = (res << 8) | get_u8 (); 295 case 4: res = (res << 8) | get_u8 ();
289 case 3: res = (res << 8) | get_u8 (); 296 case 3: res = (res << 8) | get_u8 ();
290 case 2: res = (res << 8) | get_u8 (); 297 case 2: res = (res << 8) | get_u8 ();
291 case 1: res = (res << 8) | get_u8 (); 298 case 1: res = (res << 8) | get_u8 ();
292 } 299 }
… …
294 301
295 return res; 302 return res;
296} 303}
297 304
298static SV * 305static SV *
299decode_int () 306decode_int (void)
300{ 307{
301 int len = get_length (); 308 UV len = get_length ();
302 309
303 if (len <= 0) 310 if (!len)
304 { 311 {
305 error ("integer length equal to zero"); 312 error ("invalid integer length equal to zero");
306 return 0; 313 return 0;
307 } 314 }
308 315
309 U8 *data = get_n (len); 316 U8 *data = get_n (len);
310 317
… …
322} 329}
323 330
324static SV * 331static SV *
325decode_data (void) 332decode_data (void)
326{ 333{
327 U32 len = get_length (); 334 UV len = get_length ();
328 U8 *data = get_n (len);
329 return newSVpvn ((char *)data, len); 335 return newSVpvn ((char *)get_n (len), len);
330} 336}
331 337
332// gelper for decode_object_identifier 338// helper for decode_object_identifier
333static char * 339static char *
334write_uv (char *buf, U32 u) 340write_uv (char *buf, UV u)
335{ 341{
336 // the one-digit case is absolutely predominant, so this pays off (hopefully) 342 // the one-digit case is absolutely predominant, so this pays off (hopefully)
337 if (expect_true (u < 10)) 343 if (expect_true (u < 10))
338 *buf++ = u + '0'; 344 *buf++ = u + '0';
339 else 345 else
340 { 346 {
341 // this *could* be done much faster using branchless fixed-ppint arithmetics 347 // this *could* be done much faster using branchless fixed-point arithmetics
342 char *beg = buf; 348 char *beg = buf;
343 349
344 do 350 do
345 { 351 {
346 *buf++ = u % 10 + '0'; 352 *buf++ = u % 10 + '0';
… …
363} 369}
364 370
365static SV * 371static SV *
366decode_oid (int relative) 372decode_oid (int relative)
367{ 373{
368 U32 len = get_length (); 374 UV len = get_length ();
369 375
370 if (len <= 0) 376 if (len <= 0)
371 { 377 {
372 error ("OBJECT IDENTIFIER length equal to zero"); 378 error ("OBJECT IDENTIFIER length equal to zero");
373 return &PL_sv_undef; 379 return &PL_sv_undef;
374 } 380 }
375 381
376 U8 *end = cur + len; 382 U8 *end = cur + len;
377 U32 w = get_w (); 383 UV w = get_w ();
378 384
379 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack 385 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack
380 char *app = oid; 386 char *app = oid;
381 387
382 if (relative) 388 if (relative)
383 app = write_uv (app, w); 389 app = write_uv (app, w);
384 else 390 else if (w < 2 * 40)
385 { 391 {
386 app = write_uv (app, (U8)w / 40); 392 app = write_uv (app, (U8)w / 40);
387 *app++ = '.'; 393 *app++ = '.';
388 app = write_uv (app, (U8)w % 40); 394 app = write_uv (app, (U8)w % 40);
389 } 395 }
396 else
397 {
398 app = write_uv (app, 2);
399 *app++ = '.';
400 app = write_uv (app, w - 2 * 40);
401 }
390 402
391 while (cur < end) 403 while (cur < end)
392 { 404 {
393 // we assume an oid component is never > 64 digits 405 // we assume an oid component is never > 64 digits
394 if (oid + sizeof (oid) - app < 64) 406 if (oid + sizeof (oid) - app < 64)
… …
406static SV * 418static SV *
407decode_ucs (int chrsize) 419decode_ucs (int chrsize)
408{ 420{
409 SV *res = NEWSV (0, 0); 421 SV *res = NEWSV (0, 0);
410 422
411 U32 len = get_length (); 423 UV len = get_length ();
412 424
413 if (len & (chrsize - 1)) 425 if (len & (chrsize - 1))
414 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len); 426 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
415 427
416 while (len) 428 while (len)
… …
437 449
438 return res; 450 return res;
439} 451}
440 452
441static SV * 453static SV *
442decode_ber () 454decode_ber (void)
443{ 455{
444 int identifier = get_u8 (); 456 int identifier = get_u8 ();
445 457
446 SV *res; 458 SV *res;
447 459
… …
455 if (tag == ASN_TAG_BER) 467 if (tag == ASN_TAG_BER)
456 tag = get_w (); 468 tag = get_w ();
457 469
458 if (constructed) 470 if (constructed)
459 { 471 {
460 U32 len = get_length (); 472 UV len = get_length ();
461 U32 seqend = (cur - buf) + len; 473 UV seqend = (cur - buf) + len;
462 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 474 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
463 475
464 while (cur < buf + seqend) 476 while (cur < buf + seqend)
465 av_push (av, decode_ber ()); 477 av_push (av, decode_ber ());
466 478
… …
472 else 484 else
473 switch (profile_lookup (cur_profile, klass, tag)) 485 switch (profile_lookup (cur_profile, klass, tag))
474 { 486 {
475 case BER_TYPE_NULL: 487 case BER_TYPE_NULL:
476 { 488 {
477 U32 len = get_length (); 489 UV len = get_length ();
478 490
479 if (len) 491 if (len)
480 croak ("BER_TYPE_NULL value with non-zero length %d encountered", len); 492 croak ("BER_TYPE_NULL value with non-zero length %d encountered", len);
481 493
482 res = &PL_sv_undef; 494 res = &PL_sv_undef;
483 } 495 }
484 break; 496 break;
485 497
486 case BER_TYPE_BOOL: 498 case BER_TYPE_BOOL:
487 { 499 {
488 U32 len = get_length (); 500 UV len = get_length ();
489 501
490 if (len != 1) 502 if (len != 1)
491 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len); 503 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len);
492 504
493 res = newSVcacheint (!!get_u8 ()); 505 res = newSVcacheint (!!get_u8 ());
… …
515 res = decode_data (); 527 res = decode_data ();
516 break; 528 break;
517 529
518 case BER_TYPE_IPADDRESS: 530 case BER_TYPE_IPADDRESS:
519 { 531 {
520 U32 len = get_length (); 532 UV len = get_length ();
521 533
522 if (len != 4) 534 if (len != 4)
523 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 535 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len);
524 536
525 U8 c1 = get_u8 (); 537 U8 c1 = get_u8 ();
… …
545 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 557 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
546 } 558 }
547 559
548 AV *av = newAV (); 560 AV *av = newAV ();
549 av_fill (av, BER_ARRAYSIZE - 1); 561 av_fill (av, BER_ARRAYSIZE - 1);
550 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 562 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
551 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 563 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
552 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 564 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
553 AvARRAY (av)[BER_DATA ] = res; 565 AvARRAY (av)[BER_DATA ] = res;
554 566
555 return newRV_noinc ((SV *)av); 567 return newRV_noinc ((SV *)av);
556} 568}
557 569
558///////////////////////////////////////////////////////////////////////////// 570/////////////////////////////////////////////////////////////////////////////
… …
611 need (1); 623 need (1);
612 *cur++ = val; 624 *cur++ = val;
613} 625}
614 626
615static void 627static void
616put_w_nocheck (U32 val) 628put_w_nocheck (UV val)
617{ 629{
630#if UVSIZE > 4
631 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
632 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
633 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
634 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
635 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
636#endif
618 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 637 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
619 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 638 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
620 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 639 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
621 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 640 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
622 *cur = val & 0x7f; cur += 1; 641 *cur = val & 0x7f; cur += 1;
623} 642}
624 643
625static void 644static void
626put_w (U32 val) 645put_w (UV val)
627{ 646{
628 need (5); // we only handle up to 5 bytes 647 need (5); // we only handle up to 5 bytes
629 648
630 put_w_nocheck (val); 649 put_w_nocheck (val);
631} 650}
632 651
633static U8 * 652static U8 *
634put_length_at (U32 val, U8 *cur) 653put_length_at (UV val, U8 *cur)
635{ 654{
636 if (val < 0x7fU) 655 if (val < 0x7fU)
637 *cur++ = val; 656 *cur++ = val;
638 else 657 else
639 { 658 {
640 U8 *lenb = cur++; 659 U8 *lenb = cur++;
641 660
661#if UVSIZE > 4
662 *cur = val >> 56; cur += *cur > 0;
663 *cur = val >> 48; cur += *cur > 0;
664 *cur = val >> 40; cur += *cur > 0;
665 *cur = val >> 32; cur += *cur > 0;
666#endif
642 *cur = val >> 24; cur += *cur > 0; 667 *cur = val >> 24; cur += *cur > 0;
643 *cur = val >> 16; cur += *cur > 0; 668 *cur = val >> 16; cur += *cur > 0;
644 *cur = val >> 8; cur += *cur > 0; 669 *cur = val >> 8; cur += *cur > 0;
645 *cur = val ; cur += 1; 670 *cur = val ; cur += 1;
646 671
… …
649 674
650 return cur; 675 return cur;
651} 676}
652 677
653static void 678static void
654put_length (U32 val) 679put_length (UV val)
655{ 680{
656 need (5 + val); 681 need (5 + val);
657 cur = put_length_at (val, cur); 682 cur = put_length_at (val, cur);
658} 683}
659 684
660// return how many bytes the encoded length requires 685// return how many bytes the encoded length requires
661static int length_length (U32 val) 686static int length_length (UV val)
662{ 687{
663 return val < 0x7fU 688 return val < 0x7fU
664 ? 1 689 ? 1
665 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 690 : 2
691 + (val > 0xffU)
692 + (val > 0xffffU)
693 + (val > 0xffffffU)
694#if UVSIZE > 4
695 + (val > 0xffffffffU)
696 + (val > 0xffffffffffU)
697 + (val > 0xffffffffffffU)
698 + (val > 0xffffffffffffffU)
699#endif
700 ;
666} 701}
667 702
668static void 703static void
669encode_data (const char *ptr, STRLEN len) 704encode_data (const char *ptr, STRLEN len)
670{ 705{
… …
732 767
733 *lenb = cur - lenb - 1; 768 *lenb = cur - lenb - 1;
734} 769}
735 770
736// we don't know the length yet, so we optimistically 771// we don't know the length yet, so we optimistically
737// assume the length will need one octet later. if that 772// assume the length will need one octet later. If that
738// turns out to be wrong, we memove as needed. 773// turns out to be wrong, we memmove as needed.
739// mark the beginning 774// mark the beginning
740static STRLEN 775static STRLEN
741len_fixup_mark () 776len_fixup_mark (void)
742{ 777{
743 return cur++ - buf; 778 return cur++ - buf;
744} 779}
745 780
746// patch up the length 781// patch up the length
… …
855{ 890{
856 AV *av = ber_tuple (tuple); 891 AV *av = ber_tuple (tuple);
857 892
858 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 893 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
859 int tag = SvIV (AvARRAY (av)[BER_TAG]); 894 int tag = SvIV (AvARRAY (av)[BER_TAG]);
860 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 895 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
861 SV *data = AvARRAY (av)[BER_DATA]; 896 SV *data = AvARRAY (av)[BER_DATA];
862 897
863 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 898 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
864 899
865 if (expect_false (tag >= ASN_TAG_BER)) 900 if (expect_false (tag >= ASN_TAG_BER))
… …
899 put_length (0); 934 put_length (0);
900 break; 935 break;
901 936
902 case BER_TYPE_BOOL: 937 case BER_TYPE_BOOL:
903 put_length (1); 938 put_length (1);
904 *cur++ = SvTRUE (data) ? 0xff : 0x00; 939 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
905 break; 940 break;
906 941
907 case BER_TYPE_OID: 942 case BER_TYPE_OID:
908 encode_oid (data, 0); 943 encode_oid (data, 0);
909 break; 944 break;
… …
972 const char *name; 1007 const char *name;
973 IV iv; 1008 IV iv;
974 } *civ, const_iv[] = { 1009 } *civ, const_iv[] = {
975#define const_iv(name) { # name, name }, 1010#define const_iv(name) { # name, name },
976 const_iv (ASN_BOOLEAN) 1011 const_iv (ASN_BOOLEAN)
977 const_iv (ASN_INTEGER32) 1012 const_iv (ASN_INTEGER)
978 const_iv (ASN_BIT_STRING) 1013 const_iv (ASN_BIT_STRING)
979 const_iv (ASN_OCTET_STRING) 1014 const_iv (ASN_OCTET_STRING)
980 const_iv (ASN_NULL) 1015 const_iv (ASN_NULL)
981 const_iv (ASN_OBJECT_IDENTIFIER) 1016 const_iv (ASN_OBJECT_IDENTIFIER)
982 const_iv (ASN_OBJECT_DESCRIPTOR) 1017 const_iv (ASN_OBJECT_DESCRIPTOR)
… …
1011 const_iv (ASN_CONTEXT) 1046 const_iv (ASN_CONTEXT)
1012 const_iv (ASN_PRIVATE) 1047 const_iv (ASN_PRIVATE)
1013 1048
1014 const_iv (BER_CLASS) 1049 const_iv (BER_CLASS)
1015 const_iv (BER_TAG) 1050 const_iv (BER_TAG)
1016 const_iv (BER_CONSTRUCTED) 1051 const_iv (BER_FLAGS)
1017 const_iv (BER_DATA) 1052 const_iv (BER_DATA)
1018 1053
1019 const_iv (BER_TYPE_BYTES) 1054 const_iv (BER_TYPE_BYTES)
1020 const_iv (BER_TYPE_UTF8) 1055 const_iv (BER_TYPE_UTF8)
1021 const_iv (BER_TYPE_UCS2) 1056 const_iv (BER_TYPE_UCS2)
… …
1054 RETVAL = decode_ber (); 1089 RETVAL = decode_ber ();
1055} 1090}
1056 OUTPUT: RETVAL 1091 OUTPUT: RETVAL
1057 1092
1058void 1093void
1059ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &PL_sv_undef, SV *data = &PL_sv_undef) 1094ber_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: 1095 PPCODE:
1061{ 1096{
1062 if (!SvOK (tuple)) 1097 if (!SvOK (tuple))
1063 XSRETURN_NO; 1098 XSRETURN_NO;
1064 1099
… …
1066 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1101 croak ("ber_is: tuple must be BER tuple (array-ref)");
1067 1102
1068 AV *av = (AV *)SvRV (tuple); 1103 AV *av = (AV *)SvRV (tuple);
1069 1104
1070 XPUSHs ( 1105 XPUSHs (
1071 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1106 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1072 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1107 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1073 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1108 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1074 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1109 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1075 ? &PL_sv_yes : &PL_sv_undef); 1110 ? &PL_sv_yes : &PL_sv_undef);
1076} 1111}
1077 1112
1078void 1113void
1079ber_is_seq (SV *tuple) 1114ber_is_seq (SV *tuple)
… …
1083 XSRETURN_UNDEF; 1118 XSRETURN_UNDEF;
1084 1119
1085 AV *av = ber_tuple (tuple); 1120 AV *av = ber_tuple (tuple);
1086 1121
1087 XPUSHs ( 1122 XPUSHs (
1088 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1123 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1089 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1124 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1090 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1125 && SvIV (AvARRAY (av)[BER_FLAGS])
1091 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1126 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1092} 1127}
1093 1128
1094void 1129void
1095ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1130ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1096 PPCODE: 1131 PPCODE:
1097{ 1132{
1098 if (!SvOK (tuple)) 1133 if (!SvOK (tuple))
1099 XSRETURN_NO; 1134 XSRETURN_NO;
1100 1135
1101 AV *av = ber_tuple (tuple); 1136 AV *av = ber_tuple (tuple);
1102 1137
1103 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1138 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1104 1139
1105 XPUSHs ( 1140 XPUSHs (
1106 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1141 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1107 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1142 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1108 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1143 && !SvIV (AvARRAY (av)[BER_FLAGS])
1109 && (!SvOK (value) || data == SvIV (value)) 1144 && (!SvOK (value) || data == SvUV (value))
1110 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1145 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1111 : &PL_sv_undef); 1146 : &PL_sv_undef);
1112} 1147}
1113 1148
1114void 1149void
1115ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1150ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
… …
1119 XSRETURN_NO; 1154 XSRETURN_NO;
1120 1155
1121 AV *av = ber_tuple (tuple); 1156 AV *av = ber_tuple (tuple);
1122 1157
1123 XPUSHs ( 1158 XPUSHs (
1124 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1159 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1125 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1160 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1126 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1161 && !SvIV (AvARRAY (av)[BER_FLAGS])
1127 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1162 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1128 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1163 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1129} 1164}
1130 1165
1131############################################################################# 1166#############################################################################
… …
1144 SvCUR_set (buf_sv, cur - buf); 1179 SvCUR_set (buf_sv, cur - buf);
1145 XPUSHs (buf_sv); 1180 XPUSHs (buf_sv);
1146} 1181}
1147 1182
1148SV * 1183SV *
1149ber_i32 (IV iv) 1184ber_int (SV *sv)
1150 CODE: 1185 CODE:
1151{ 1186{
1152 AV *av = newAV (); 1187 AV *av = newAV ();
1153 av_fill (av, BER_ARRAYSIZE - 1); 1188 av_fill (av, BER_ARRAYSIZE - 1);
1154 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1189 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1155 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1190 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1156 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1191 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1157 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1192 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1158 RETVAL = newRV_noinc ((SV *)av); 1193 RETVAL = newRV_noinc ((SV *)av);
1159} 1194}
1160 OUTPUT: RETVAL 1195 OUTPUT: RETVAL
1161 1196
1162# TODO: not arrayref, but elements? 1197# TODO: not arrayref, but elements?
… …
1164ber_seq (SV *arrayref) 1199ber_seq (SV *arrayref)
1165 CODE: 1200 CODE:
1166{ 1201{
1167 AV *av = newAV (); 1202 AV *av = newAV ();
1168 av_fill (av, BER_ARRAYSIZE - 1); 1203 av_fill (av, BER_ARRAYSIZE - 1);
1169 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1204 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1170 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1205 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1171 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1206 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1172 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1207 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1173 RETVAL = newRV_noinc ((SV *)av); 1208 RETVAL = newRV_noinc ((SV *)av);
1174} 1209}
1175 OUTPUT: RETVAL 1210 OUTPUT: RETVAL
1176 1211
1177MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1212MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines