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.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_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;
… …
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 {
347 // this *could* be done much faster using branchless fixed-point arithmetics
341 char *beg = buf; 348 char *beg = buf;
342 349
343 do 350 do
344 { 351 {
345 *buf++ = u % 10 + '0'; 352 *buf++ = u % 10 + '0';
… …
347 } 354 }
348 while (u); 355 while (u);
349 356
350 // reverse digits 357 // reverse digits
351 char *ptr = buf; 358 char *ptr = buf;
352 while (--ptr != beg) 359 while (--ptr > beg)
353 { 360 {
354 char c = *ptr; 361 char c = *ptr;
355 *ptr = *beg; 362 *ptr = *beg;
356 *beg = c; 363 *beg = c;
357 ++beg; 364 ++beg;
… …
362} 369}
363 370
364static SV * 371static SV *
365decode_oid (int relative) 372decode_oid (int relative)
366{ 373{
367 U32 len = get_length (); 374 UV len = get_length ();
368 375
369 if (len <= 0) 376 if (len <= 0)
370 { 377 {
371 error ("OBJECT IDENTIFIER length equal to zero"); 378 error ("OBJECT IDENTIFIER length equal to zero");
372 return &PL_sv_undef; 379 return &PL_sv_undef;
373 } 380 }
374 381
375 U8 *end = cur + len; 382 U8 *end = cur + len;
376 U32 w = get_w (); 383 UV w = get_w ();
377 384
378 static char oid[MAX_OID_STRLEN]; // must be static 385 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack
379 char *app = oid; 386 char *app = oid;
380 387
381 if (relative) 388 if (relative)
382 app = write_uv (app, w); 389 app = write_uv (app, w);
383 else 390 else if (w < 2 * 40)
384 { 391 {
385 app = write_uv (app, (U8)w / 40); 392 app = write_uv (app, (U8)w / 40);
386 *app++ = '.'; 393 *app++ = '.';
387 app = write_uv (app, (U8)w % 40); 394 app = write_uv (app, (U8)w % 40);
388 } 395 }
396 else
397 {
398 app = write_uv (app, 2);
399 *app++ = '.';
400 app = write_uv (app, w - 2 * 40);
401 }
389 402
403 while (cur < end)
404 {
390 // we assume an oid component is never > 64 bytes 405 // we assume an oid component is never > 64 digits
391 while (cur < end && oid + sizeof (oid) - app > 64) 406 if (oid + sizeof (oid) - app < 64)
392 { 407 croak ("BER_TYPE_OID to long to decode");
408
393 w = get_w (); 409 w = get_w ();
394 *app++ = '.'; 410 *app++ = '.';
395 app = write_uv (app, w); 411 app = write_uv (app, w);
396 } 412 }
397 413
… …
402static SV * 418static SV *
403decode_ucs (int chrsize) 419decode_ucs (int chrsize)
404{ 420{
405 SV *res = NEWSV (0, 0); 421 SV *res = NEWSV (0, 0);
406 422
407 U32 len = get_length (); 423 UV len = get_length ();
408 424
409 if (len & (chrsize - 1)) 425 if (len & (chrsize - 1))
410 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);
411 427
412 while (len) 428 while (len)
… …
433 449
434 return res; 450 return res;
435} 451}
436 452
437static SV * 453static SV *
438decode_ber () 454decode_ber (void)
439{ 455{
440 int identifier = get_u8 (); 456 int identifier = get_u8 ();
441 457
442 SV *res; 458 SV *res;
443 459
… …
451 if (tag == ASN_TAG_BER) 467 if (tag == ASN_TAG_BER)
452 tag = get_w (); 468 tag = get_w ();
453 469
454 if (constructed) 470 if (constructed)
455 { 471 {
456 U32 len = get_length (); 472 UV len = get_length ();
457 U32 seqend = (cur - buf) + len; 473 UV seqend = (cur - buf) + len;
458 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 474 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
459 475
460 while (cur < buf + seqend) 476 while (cur < buf + seqend)
461 av_push (av, decode_ber ()); 477 av_push (av, decode_ber ());
462 478
… …
467 } 483 }
468 else 484 else
469 switch (profile_lookup (cur_profile, klass, tag)) 485 switch (profile_lookup (cur_profile, klass, tag))
470 { 486 {
471 case BER_TYPE_NULL: 487 case BER_TYPE_NULL:
488 {
489 UV len = get_length ();
490
491 if (len)
492 croak ("BER_TYPE_NULL value with non-zero length %d encountered", len);
493
472 res = &PL_sv_undef; 494 res = &PL_sv_undef;
495 }
473 break; 496 break;
474 497
475 case BER_TYPE_BOOL: 498 case BER_TYPE_BOOL:
476 { 499 {
477 U32 len = get_length (); 500 UV len = get_length ();
478 501
479 if (len != 1) 502 if (len != 1)
480 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len); 503 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len);
481 504
482 res = newSVcacheint (get_u8 () ? 0 : 1); 505 res = newSVcacheint (!!get_u8 ());
483 } 506 }
484 break; 507 break;
485 508
486 case BER_TYPE_OID: 509 case BER_TYPE_OID:
487 res = decode_oid (0); 510 res = decode_oid (0);
… …
504 res = decode_data (); 527 res = decode_data ();
505 break; 528 break;
506 529
507 case BER_TYPE_IPADDRESS: 530 case BER_TYPE_IPADDRESS:
508 { 531 {
509 U32 len = get_length (); 532 UV len = get_length ();
510 533
511 if (len != 4) 534 if (len != 4)
512 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 535 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len);
513 536
514 U8 c1 = get_u8 (); 537 U8 c1 = get_u8 ();
… …
534 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 557 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
535 } 558 }
536 559
537 AV *av = newAV (); 560 AV *av = newAV ();
538 av_fill (av, BER_ARRAYSIZE - 1); 561 av_fill (av, BER_ARRAYSIZE - 1);
539 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 562 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
540 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 563 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
541 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 564 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
542 AvARRAY (av)[BER_DATA ] = res; 565 AvARRAY (av)[BER_DATA ] = res;
543 566
544 return newRV_noinc ((SV *)av); 567 return newRV_noinc ((SV *)av);
545} 568}
546 569
547///////////////////////////////////////////////////////////////////////////// 570/////////////////////////////////////////////////////////////////////////////
… …
600 need (1); 623 need (1);
601 *cur++ = val; 624 *cur++ = val;
602} 625}
603 626
604static void 627static void
605put_w_nocheck (U32 val) 628put_w_nocheck (UV val)
606{ 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
607 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 637 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
608 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 638 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
609 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 639 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
610 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 640 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
611 *cur = val & 0x7f; cur += 1; 641 *cur = val & 0x7f; cur += 1;
612} 642}
613 643
614static void 644static void
615put_w (U32 val) 645put_w (UV val)
616{ 646{
617 need (5); // we only handle up to 5 bytes 647 need (5); // we only handle up to 5 bytes
618 648
619 put_w_nocheck (val); 649 put_w_nocheck (val);
620} 650}
621 651
622static U8 * 652static U8 *
623put_length_at (U32 val, U8 *cur) 653put_length_at (UV val, U8 *cur)
624{ 654{
625 if (val < 0x7fU) 655 if (val < 0x7fU)
626 *cur++ = val; 656 *cur++ = val;
627 else 657 else
628 { 658 {
629 U8 *lenb = cur++; 659 U8 *lenb = cur++;
630 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
631 *cur = val >> 24; cur += *cur > 0; 667 *cur = val >> 24; cur += *cur > 0;
632 *cur = val >> 16; cur += *cur > 0; 668 *cur = val >> 16; cur += *cur > 0;
633 *cur = val >> 8; cur += *cur > 0; 669 *cur = val >> 8; cur += *cur > 0;
634 *cur = val ; cur += 1; 670 *cur = val ; cur += 1;
635 671
… …
638 674
639 return cur; 675 return cur;
640} 676}
641 677
642static void 678static void
643put_length (U32 val) 679put_length (UV val)
644{ 680{
645 need (5 + val); 681 need (5 + val);
646 cur = put_length_at (val, cur); 682 cur = put_length_at (val, cur);
647} 683}
648 684
649// return how many bytes the encoded length requires 685// return how many bytes the encoded length requires
650static int length_length (U32 val) 686static int length_length (UV val)
651{ 687{
652 return val < 0x7fU 688 return val < 0x7fU
653 ? 1 689 ? 1
654 : 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 ;
655} 701}
656 702
657static void 703static void
658encode_data (const char *ptr, STRLEN len) 704encode_data (const char *ptr, STRLEN len)
659{ 705{
… …
721 767
722 *lenb = cur - lenb - 1; 768 *lenb = cur - lenb - 1;
723} 769}
724 770
725// we don't know the length yet, so we optimistically 771// we don't know the length yet, so we optimistically
726// assume the length will need one octet later. if that 772// assume the length will need one octet later. If that
727// turns out to be wrong, we memove as needed. 773// turns out to be wrong, we memmove as needed.
728// mark the beginning 774// mark the beginning
729static STRLEN 775static STRLEN
730len_fixup_mark () 776len_fixup_mark (void)
731{ 777{
732 return cur++ - buf; 778 return cur++ - buf;
733} 779}
734 780
735// patch up the length 781// patch up the length
… …
844{ 890{
845 AV *av = ber_tuple (tuple); 891 AV *av = ber_tuple (tuple);
846 892
847 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 893 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
848 int tag = SvIV (AvARRAY (av)[BER_TAG]); 894 int tag = SvIV (AvARRAY (av)[BER_TAG]);
849 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 895 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
850 SV *data = AvARRAY (av)[BER_DATA]; 896 SV *data = AvARRAY (av)[BER_DATA];
851 897
852 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 898 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
853 899
854 if (expect_false (tag >= ASN_TAG_BER)) 900 if (expect_false (tag >= ASN_TAG_BER))
… …
888 put_length (0); 934 put_length (0);
889 break; 935 break;
890 936
891 case BER_TYPE_BOOL: 937 case BER_TYPE_BOOL:
892 put_length (1); 938 put_length (1);
893 *cur++ = SvTRUE (data) ? 0xff : 0x00; 939 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
894 break; 940 break;
895 941
896 case BER_TYPE_OID: 942 case BER_TYPE_OID:
897 encode_oid (data, 0); 943 encode_oid (data, 0);
898 break; 944 break;
… …
961 const char *name; 1007 const char *name;
962 IV iv; 1008 IV iv;
963 } *civ, const_iv[] = { 1009 } *civ, const_iv[] = {
964#define const_iv(name) { # name, name }, 1010#define const_iv(name) { # name, name },
965 const_iv (ASN_BOOLEAN) 1011 const_iv (ASN_BOOLEAN)
966 const_iv (ASN_INTEGER32) 1012 const_iv (ASN_INTEGER)
967 const_iv (ASN_BIT_STRING) 1013 const_iv (ASN_BIT_STRING)
968 const_iv (ASN_OCTET_STRING) 1014 const_iv (ASN_OCTET_STRING)
969 const_iv (ASN_NULL) 1015 const_iv (ASN_NULL)
970 const_iv (ASN_OBJECT_IDENTIFIER) 1016 const_iv (ASN_OBJECT_IDENTIFIER)
971 const_iv (ASN_OBJECT_DESCRIPTOR) 1017 const_iv (ASN_OBJECT_DESCRIPTOR)
… …
1000 const_iv (ASN_CONTEXT) 1046 const_iv (ASN_CONTEXT)
1001 const_iv (ASN_PRIVATE) 1047 const_iv (ASN_PRIVATE)
1002 1048
1003 const_iv (BER_CLASS) 1049 const_iv (BER_CLASS)
1004 const_iv (BER_TAG) 1050 const_iv (BER_TAG)
1005 const_iv (BER_CONSTRUCTED) 1051 const_iv (BER_FLAGS)
1006 const_iv (BER_DATA) 1052 const_iv (BER_DATA)
1007 1053
1008 const_iv (BER_TYPE_BYTES) 1054 const_iv (BER_TYPE_BYTES)
1009 const_iv (BER_TYPE_UTF8) 1055 const_iv (BER_TYPE_UTF8)
1010 const_iv (BER_TYPE_UCS2) 1056 const_iv (BER_TYPE_UCS2)
… …
1043 RETVAL = decode_ber (); 1089 RETVAL = decode_ber ();
1044} 1090}
1045 OUTPUT: RETVAL 1091 OUTPUT: RETVAL
1046 1092
1047void 1093void
1048ber_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)
1049 PPCODE: 1095 PPCODE:
1050{ 1096{
1051 if (!SvOK (tuple)) 1097 if (!SvOK (tuple))
1052 XSRETURN_NO; 1098 XSRETURN_NO;
1053 1099
… …
1055 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1101 croak ("ber_is: tuple must be BER tuple (array-ref)");
1056 1102
1057 AV *av = (AV *)SvRV (tuple); 1103 AV *av = (AV *)SvRV (tuple);
1058 1104
1059 XPUSHs ( 1105 XPUSHs (
1060 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1106 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1061 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1107 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1062 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1108 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1063 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1109 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1064 ? &PL_sv_yes : &PL_sv_undef); 1110 ? &PL_sv_yes : &PL_sv_undef);
1065} 1111}
1066 1112
1067void 1113void
1068ber_is_seq (SV *tuple) 1114ber_is_seq (SV *tuple)
… …
1072 XSRETURN_UNDEF; 1118 XSRETURN_UNDEF;
1073 1119
1074 AV *av = ber_tuple (tuple); 1120 AV *av = ber_tuple (tuple);
1075 1121
1076 XPUSHs ( 1122 XPUSHs (
1077 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1123 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1078 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1124 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1079 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1125 && SvIV (AvARRAY (av)[BER_FLAGS])
1080 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1126 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1081} 1127}
1082 1128
1083void 1129void
1084ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1130ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1085 PPCODE: 1131 PPCODE:
1086{ 1132{
1087 if (!SvOK (tuple)) 1133 if (!SvOK (tuple))
1088 XSRETURN_NO; 1134 XSRETURN_NO;
1089 1135
1090 AV *av = ber_tuple (tuple); 1136 AV *av = ber_tuple (tuple);
1091 1137
1092 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1138 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1093 1139
1094 XPUSHs ( 1140 XPUSHs (
1095 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1141 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1096 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1142 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1097 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1143 && !SvIV (AvARRAY (av)[BER_FLAGS])
1098 && (!SvOK (value) || data == SvIV (value)) 1144 && (!SvOK (value) || data == SvUV (value))
1099 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1145 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1100 : &PL_sv_undef); 1146 : &PL_sv_undef);
1101} 1147}
1102 1148
1103void 1149void
1104ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1150ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
… …
1108 XSRETURN_NO; 1154 XSRETURN_NO;
1109 1155
1110 AV *av = ber_tuple (tuple); 1156 AV *av = ber_tuple (tuple);
1111 1157
1112 XPUSHs ( 1158 XPUSHs (
1113 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1159 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1114 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1160 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1115 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1161 && !SvIV (AvARRAY (av)[BER_FLAGS])
1116 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1162 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1117 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1163 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1118} 1164}
1119 1165
1120############################################################################# 1166#############################################################################
… …
1133 SvCUR_set (buf_sv, cur - buf); 1179 SvCUR_set (buf_sv, cur - buf);
1134 XPUSHs (buf_sv); 1180 XPUSHs (buf_sv);
1135} 1181}
1136 1182
1137SV * 1183SV *
1138ber_i32 (IV iv) 1184ber_int (SV *sv)
1139 CODE: 1185 CODE:
1140{ 1186{
1141 AV *av = newAV (); 1187 AV *av = newAV ();
1142 av_fill (av, BER_ARRAYSIZE - 1); 1188 av_fill (av, BER_ARRAYSIZE - 1);
1143 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1189 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1144 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1190 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1145 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1191 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1146 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1192 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1147 RETVAL = newRV_noinc ((SV *)av); 1193 RETVAL = newRV_noinc ((SV *)av);
1148} 1194}
1149 OUTPUT: RETVAL 1195 OUTPUT: RETVAL
1150 1196
1151# TODO: not arrayref, but elements? 1197# TODO: not arrayref, but elements?
… …
1153ber_seq (SV *arrayref) 1199ber_seq (SV *arrayref)
1154 CODE: 1200 CODE:
1155{ 1201{
1156 AV *av = newAV (); 1202 AV *av = newAV ();
1157 av_fill (av, BER_ARRAYSIZE - 1); 1203 av_fill (av, BER_ARRAYSIZE - 1);
1158 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1204 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1159 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1205 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1160 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1206 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1161 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1207 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1162 RETVAL = newRV_noinc ((SV *)av); 1208 RETVAL = newRV_noinc ((SV *)av);
1163} 1209}
1164 OUTPUT: RETVAL 1210 OUTPUT: RETVAL
1165 1211
1166MODULE = 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