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.12 by root, Sat Apr 20 12:35:03 2019 UTC vs.
Revision 1.16 by root, Sat Apr 20 15:37:27 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_OBJECT_DESCRIPTOR, BER_TYPE_OID },
200 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID }, 199 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
201 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL }, 200 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
201 { ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
202 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 }, 202 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },
203 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 }, 203 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },
204 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 }, 204 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },
205 }; 205 };
206 206
… …
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;
… …
283 283
284 default: 284 default:
285 error ("ASN.1 length too long"); 285 error ("ASN.1 length too long");
286 return 0; 286 return 0;
287 287
288 case 8: res = (res << 8) | get_u8 ();
289 case 7: res = (res << 8) | get_u8 ();
290 case 6: res = (res << 8) | get_u8 ();
291 case 5: res = (res << 8) | get_u8 ();
288 case 4: res = (res << 8) | get_u8 (); 292 case 4: res = (res << 8) | get_u8 ();
289 case 3: res = (res << 8) | get_u8 (); 293 case 3: res = (res << 8) | get_u8 ();
290 case 2: res = (res << 8) | get_u8 (); 294 case 2: res = (res << 8) | get_u8 ();
291 case 1: res = (res << 8) | get_u8 (); 295 case 1: res = (res << 8) | get_u8 ();
292 } 296 }
… …
294 298
295 return res; 299 return res;
296} 300}
297 301
298static SV * 302static SV *
299decode_int () 303decode_int (void)
300{ 304{
301 int len = get_length (); 305 UV len = get_length ();
302 306
303 if (len <= 0) 307 if (!len)
304 { 308 {
305 error ("integer length equal to zero"); 309 error ("invalid integer length equal to zero");
306 return 0; 310 return 0;
307 } 311 }
308 312
309 U8 *data = get_n (len); 313 U8 *data = get_n (len);
310 314
… …
322} 326}
323 327
324static SV * 328static SV *
325decode_data (void) 329decode_data (void)
326{ 330{
327 U32 len = get_length (); 331 UV len = get_length ();
328 U8 *data = get_n (len);
329 return newSVpvn ((char *)data, len); 332 return newSVpvn ((char *)get_n (len), len);
330} 333}
331 334
332// gelper for decode_object_identifier 335// helper for decode_object_identifier
333static char * 336static char *
334write_uv (char *buf, U32 u) 337write_uv (char *buf, UV u)
335{ 338{
336 // the one-digit case is absolutely predominant, so this pays off (hopefully) 339 // the one-digit case is absolutely predominant, so this pays off (hopefully)
337 if (expect_true (u < 10)) 340 if (expect_true (u < 10))
338 *buf++ = u + '0'; 341 *buf++ = u + '0';
339 else 342 else
340 { 343 {
344 // this *could* be done much faster using branchless fixed-point arithmetics
341 char *beg = buf; 345 char *beg = buf;
342 346
343 do 347 do
344 { 348 {
345 *buf++ = u % 10 + '0'; 349 *buf++ = u % 10 + '0';
… …
347 } 351 }
348 while (u); 352 while (u);
349 353
350 // reverse digits 354 // reverse digits
351 char *ptr = buf; 355 char *ptr = buf;
352 while (--ptr != beg) 356 while (--ptr > beg)
353 { 357 {
354 char c = *ptr; 358 char c = *ptr;
355 *ptr = *beg; 359 *ptr = *beg;
356 *beg = c; 360 *beg = c;
357 ++beg; 361 ++beg;
… …
362} 366}
363 367
364static SV * 368static SV *
365decode_oid (int relative) 369decode_oid (int relative)
366{ 370{
367 U32 len = get_length (); 371 UV len = get_length ();
368 372
369 if (len <= 0) 373 if (len <= 0)
370 { 374 {
371 error ("OBJECT IDENTIFIER length equal to zero"); 375 error ("OBJECT IDENTIFIER length equal to zero");
372 return &PL_sv_undef; 376 return &PL_sv_undef;
373 } 377 }
374 378
375 U8 *end = cur + len; 379 U8 *end = cur + len;
376 U32 w = get_w (); 380 UV w = get_w ();
377 381
378 static char oid[MAX_OID_STRLEN]; // must be static 382 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack
379 char *app = oid; 383 char *app = oid;
380 384
381 if (relative) 385 if (relative)
382 app = write_uv (app, w); 386 app = write_uv (app, w);
383 else 387 else
… …
385 app = write_uv (app, (U8)w / 40); 389 app = write_uv (app, (U8)w / 40);
386 *app++ = '.'; 390 *app++ = '.';
387 app = write_uv (app, (U8)w % 40); 391 app = write_uv (app, (U8)w % 40);
388 } 392 }
389 393
394 while (cur < end)
395 {
390 // we assume an oid component is never > 64 bytes 396 // we assume an oid component is never > 64 digits
391 while (cur < end && oid + sizeof (oid) - app > 64) 397 if (oid + sizeof (oid) - app < 64)
392 { 398 croak ("BER_TYPE_OID to long to decode");
399
393 w = get_w (); 400 w = get_w ();
394 *app++ = '.'; 401 *app++ = '.';
395 app = write_uv (app, w); 402 app = write_uv (app, w);
396 } 403 }
397 404
… …
402static SV * 409static SV *
403decode_ucs (int chrsize) 410decode_ucs (int chrsize)
404{ 411{
405 SV *res = NEWSV (0, 0); 412 SV *res = NEWSV (0, 0);
406 413
407 U32 len = get_length (); 414 UV len = get_length ();
408 415
409 if (len & (chrsize - 1)) 416 if (len & (chrsize - 1))
410 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len); 417 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
411 418
412 while (len) 419 while (len)
… …
433 440
434 return res; 441 return res;
435} 442}
436 443
437static SV * 444static SV *
438decode_ber () 445decode_ber (void)
439{ 446{
440 int identifier = get_u8 (); 447 int identifier = get_u8 ();
441 448
442 SV *res; 449 SV *res;
443 450
… …
451 if (tag == ASN_TAG_BER) 458 if (tag == ASN_TAG_BER)
452 tag = get_w (); 459 tag = get_w ();
453 460
454 if (constructed) 461 if (constructed)
455 { 462 {
456 U32 len = get_length (); 463 UV len = get_length ();
457 U32 seqend = (cur - buf) + len; 464 UV seqend = (cur - buf) + len;
458 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 465 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
459 466
460 while (cur < buf + seqend) 467 while (cur < buf + seqend)
461 av_push (av, decode_ber ()); 468 av_push (av, decode_ber ());
462 469
… …
467 } 474 }
468 else 475 else
469 switch (profile_lookup (cur_profile, klass, tag)) 476 switch (profile_lookup (cur_profile, klass, tag))
470 { 477 {
471 case BER_TYPE_NULL: 478 case BER_TYPE_NULL:
479 {
480 UV len = get_length ();
481
482 if (len)
483 croak ("BER_TYPE_NULL value with non-zero length %d encountered", len);
484
472 res = &PL_sv_undef; 485 res = &PL_sv_undef;
486 }
473 break; 487 break;
474 488
475 case BER_TYPE_BOOL: 489 case BER_TYPE_BOOL:
476 { 490 {
477 U32 len = get_length (); 491 UV len = get_length ();
478 492
479 if (len != 1) 493 if (len != 1)
480 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len); 494 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len);
481 495
482 res = newSVcacheint (get_u8 () ? 0 : 1); 496 res = newSVcacheint (!!get_u8 ());
483 } 497 }
484 break; 498 break;
485 499
486 case BER_TYPE_OID: 500 case BER_TYPE_OID:
487 res = decode_oid (0); 501 res = decode_oid (0);
… …
504 res = decode_data (); 518 res = decode_data ();
505 break; 519 break;
506 520
507 case BER_TYPE_IPADDRESS: 521 case BER_TYPE_IPADDRESS:
508 { 522 {
509 U32 len = get_length (); 523 UV len = get_length ();
510 524
511 if (len != 4) 525 if (len != 4)
512 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 526 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len);
513 527
514 U8 c1 = get_u8 (); 528 U8 c1 = get_u8 ();
… …
534 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 548 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
535 } 549 }
536 550
537 AV *av = newAV (); 551 AV *av = newAV ();
538 av_fill (av, BER_ARRAYSIZE - 1); 552 av_fill (av, BER_ARRAYSIZE - 1);
539 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 553 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
540 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 554 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
541 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 555 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
542 AvARRAY (av)[BER_DATA ] = res; 556 AvARRAY (av)[BER_DATA ] = res;
543 557
544 return newRV_noinc ((SV *)av); 558 return newRV_noinc ((SV *)av);
545} 559}
546 560
547///////////////////////////////////////////////////////////////////////////// 561/////////////////////////////////////////////////////////////////////////////
… …
600 need (1); 614 need (1);
601 *cur++ = val; 615 *cur++ = val;
602} 616}
603 617
604static void 618static void
605put_w_nocheck (U32 val) 619put_w_nocheck (UV val)
606{ 620{
621#if UVSIZE > 4
622 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
623 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
624 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
625 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
626 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
627#endif
607 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 628 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
608 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 629 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
609 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 630 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
610 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 631 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
611 *cur = val & 0x7f; cur += 1; 632 *cur = val & 0x7f; cur += 1;
612} 633}
613 634
614static void 635static void
615put_w (U32 val) 636put_w (UV val)
616{ 637{
617 need (5); // we only handle up to 5 bytes 638 need (5); // we only handle up to 5 bytes
618 639
619 put_w_nocheck (val); 640 put_w_nocheck (val);
620} 641}
621 642
622static U8 * 643static U8 *
623put_length_at (U32 val, U8 *cur) 644put_length_at (UV val, U8 *cur)
624{ 645{
625 if (val < 0x7fU) 646 if (val < 0x7fU)
626 *cur++ = val; 647 *cur++ = val;
627 else 648 else
628 { 649 {
629 U8 *lenb = cur++; 650 U8 *lenb = cur++;
630 651
652#if UVSIZE > 4
653 *cur = val >> 56; cur += *cur > 0;
654 *cur = val >> 48; cur += *cur > 0;
655 *cur = val >> 40; cur += *cur > 0;
656 *cur = val >> 32; cur += *cur > 0;
657#endif
631 *cur = val >> 24; cur += *cur > 0; 658 *cur = val >> 24; cur += *cur > 0;
632 *cur = val >> 16; cur += *cur > 0; 659 *cur = val >> 16; cur += *cur > 0;
633 *cur = val >> 8; cur += *cur > 0; 660 *cur = val >> 8; cur += *cur > 0;
634 *cur = val ; cur += 1; 661 *cur = val ; cur += 1;
635 662
… …
638 665
639 return cur; 666 return cur;
640} 667}
641 668
642static void 669static void
643put_length (U32 val) 670put_length (UV val)
644{ 671{
645 need (5 + val); 672 need (5 + val);
646 cur = put_length_at (val, cur); 673 cur = put_length_at (val, cur);
647} 674}
648 675
649// return how many bytes the encoded length requires 676// return how many bytes the encoded length requires
650static int length_length (U32 val) 677static int length_length (UV val)
651{ 678{
652 return val < 0x7fU 679 return val < 0x7fU
653 ? 1 680 ? 1
654 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 681 : 2
682 + (val > 0xffU)
683 + (val > 0xffffU)
684 + (val > 0xffffffU)
685#if UVSIZE > 4
686 + (val > 0xffffffffU)
687 + (val > 0xffffffffffU)
688 + (val > 0xffffffffffffU)
689 + (val > 0xffffffffffffffU)
690#endif
691 ;
655} 692}
656 693
657static void 694static void
658encode_data (const char *ptr, STRLEN len) 695encode_data (const char *ptr, STRLEN len)
659{ 696{
… …
721 758
722 *lenb = cur - lenb - 1; 759 *lenb = cur - lenb - 1;
723} 760}
724 761
725// we don't know the length yet, so we optimistically 762// we don't know the length yet, so we optimistically
726// assume the length will need one octet later. if that 763// assume the length will need one octet later. If that
727// turns out to be wrong, we memove as needed. 764// turns out to be wrong, we memmove as needed.
728// mark the beginning 765// mark the beginning
729static STRLEN 766static STRLEN
730len_fixup_mark () 767len_fixup_mark (void)
731{ 768{
732 return cur++ - buf; 769 return cur++ - buf;
733} 770}
734 771
735// patch up the length 772// patch up the length
… …
844{ 881{
845 AV *av = ber_tuple (tuple); 882 AV *av = ber_tuple (tuple);
846 883
847 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 884 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
848 int tag = SvIV (AvARRAY (av)[BER_TAG]); 885 int tag = SvIV (AvARRAY (av)[BER_TAG]);
849 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 886 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
850 SV *data = AvARRAY (av)[BER_DATA]; 887 SV *data = AvARRAY (av)[BER_DATA];
851 888
852 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 889 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
853 890
854 if (expect_false (tag >= ASN_TAG_BER)) 891 if (expect_false (tag >= ASN_TAG_BER))
… …
961 const char *name; 998 const char *name;
962 IV iv; 999 IV iv;
963 } *civ, const_iv[] = { 1000 } *civ, const_iv[] = {
964#define const_iv(name) { # name, name }, 1001#define const_iv(name) { # name, name },
965 const_iv (ASN_BOOLEAN) 1002 const_iv (ASN_BOOLEAN)
966 const_iv (ASN_INTEGER32) 1003 const_iv (ASN_INTEGER)
967 const_iv (ASN_BIT_STRING) 1004 const_iv (ASN_BIT_STRING)
968 const_iv (ASN_OCTET_STRING) 1005 const_iv (ASN_OCTET_STRING)
969 const_iv (ASN_NULL) 1006 const_iv (ASN_NULL)
970 const_iv (ASN_OBJECT_IDENTIFIER) 1007 const_iv (ASN_OBJECT_IDENTIFIER)
971 const_iv (ASN_OBJECT_DESCRIPTOR) 1008 const_iv (ASN_OBJECT_DESCRIPTOR)
… …
1000 const_iv (ASN_CONTEXT) 1037 const_iv (ASN_CONTEXT)
1001 const_iv (ASN_PRIVATE) 1038 const_iv (ASN_PRIVATE)
1002 1039
1003 const_iv (BER_CLASS) 1040 const_iv (BER_CLASS)
1004 const_iv (BER_TAG) 1041 const_iv (BER_TAG)
1005 const_iv (BER_CONSTRUCTED) 1042 const_iv (BER_FLAGS)
1006 const_iv (BER_DATA) 1043 const_iv (BER_DATA)
1007 1044
1008 const_iv (BER_TYPE_BYTES) 1045 const_iv (BER_TYPE_BYTES)
1009 const_iv (BER_TYPE_UTF8) 1046 const_iv (BER_TYPE_UTF8)
1010 const_iv (BER_TYPE_UCS2) 1047 const_iv (BER_TYPE_UCS2)
… …
1043 RETVAL = decode_ber (); 1080 RETVAL = decode_ber ();
1044} 1081}
1045 OUTPUT: RETVAL 1082 OUTPUT: RETVAL
1046 1083
1047void 1084void
1048ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &PL_sv_undef, SV *data = &PL_sv_undef) 1085ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *flags = &PL_sv_undef, SV *data = &PL_sv_undef)
1049 PPCODE: 1086 PPCODE:
1050{ 1087{
1051 if (!SvOK (tuple)) 1088 if (!SvOK (tuple))
1052 XSRETURN_NO; 1089 XSRETURN_NO;
1053 1090
… …
1055 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1092 croak ("ber_is: tuple must be BER tuple (array-ref)");
1056 1093
1057 AV *av = (AV *)SvRV (tuple); 1094 AV *av = (AV *)SvRV (tuple);
1058 1095
1059 XPUSHs ( 1096 XPUSHs (
1060 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1097 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1061 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1098 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1062 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1099 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1063 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1100 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1064 ? &PL_sv_yes : &PL_sv_undef); 1101 ? &PL_sv_yes : &PL_sv_undef);
1065} 1102}
1066 1103
1067void 1104void
1068ber_is_seq (SV *tuple) 1105ber_is_seq (SV *tuple)
… …
1072 XSRETURN_UNDEF; 1109 XSRETURN_UNDEF;
1073 1110
1074 AV *av = ber_tuple (tuple); 1111 AV *av = ber_tuple (tuple);
1075 1112
1076 XPUSHs ( 1113 XPUSHs (
1077 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1114 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1078 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1115 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1079 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1116 && SvIV (AvARRAY (av)[BER_FLAGS])
1080 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1117 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1081} 1118}
1082 1119
1083void 1120void
1084ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1121ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1085 PPCODE: 1122 PPCODE:
1086{ 1123{
1087 if (!SvOK (tuple)) 1124 if (!SvOK (tuple))
1088 XSRETURN_NO; 1125 XSRETURN_NO;
1089 1126
1090 AV *av = ber_tuple (tuple); 1127 AV *av = ber_tuple (tuple);
1091 1128
1092 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1129 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1093 1130
1094 XPUSHs ( 1131 XPUSHs (
1095 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1132 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1096 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1133 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1097 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1134 && !SvIV (AvARRAY (av)[BER_FLAGS])
1098 && (!SvOK (value) || data == SvIV (value)) 1135 && (!SvOK (value) || data == SvUV (value))
1099 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1136 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1100 : &PL_sv_undef); 1137 : &PL_sv_undef);
1101} 1138}
1102 1139
1103void 1140void
1104ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1141ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
… …
1108 XSRETURN_NO; 1145 XSRETURN_NO;
1109 1146
1110 AV *av = ber_tuple (tuple); 1147 AV *av = ber_tuple (tuple);
1111 1148
1112 XPUSHs ( 1149 XPUSHs (
1113 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1150 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1114 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1151 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1115 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1152 && !SvIV (AvARRAY (av)[BER_FLAGS])
1116 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1153 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1117 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1154 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1118} 1155}
1119 1156
1120############################################################################# 1157#############################################################################
… …
1133 SvCUR_set (buf_sv, cur - buf); 1170 SvCUR_set (buf_sv, cur - buf);
1134 XPUSHs (buf_sv); 1171 XPUSHs (buf_sv);
1135} 1172}
1136 1173
1137SV * 1174SV *
1138ber_i32 (IV iv) 1175ber_int (SV *sv)
1139 CODE: 1176 CODE:
1140{ 1177{
1141 AV *av = newAV (); 1178 AV *av = newAV ();
1142 av_fill (av, BER_ARRAYSIZE - 1); 1179 av_fill (av, BER_ARRAYSIZE - 1);
1143 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1180 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1144 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1181 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1145 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1182 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1146 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1183 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1147 RETVAL = newRV_noinc ((SV *)av); 1184 RETVAL = newRV_noinc ((SV *)av);
1148} 1185}
1149 OUTPUT: RETVAL 1186 OUTPUT: RETVAL
1150 1187
1151# TODO: not arrayref, but elements? 1188# TODO: not arrayref, but elements?
… …
1153ber_seq (SV *arrayref) 1190ber_seq (SV *arrayref)
1154 CODE: 1191 CODE:
1155{ 1192{
1156 AV *av = newAV (); 1193 AV *av = newAV ();
1157 av_fill (av, BER_ARRAYSIZE - 1); 1194 av_fill (av, BER_ARRAYSIZE - 1);
1158 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1195 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1159 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1196 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1160 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1197 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1161 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1198 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1162 RETVAL = newRV_noinc ((SV *)av); 1199 RETVAL = newRV_noinc ((SV *)av);
1163} 1200}
1164 OUTPUT: RETVAL 1201 OUTPUT: RETVAL
1165 1202
1166MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1203MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

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