ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Convert-BER-XS/XS.xs
(Generate patch)

Comparing Convert-BER-XS/XS.xs (file contents):
Revision 1.10 by root, Sat Apr 20 11:12:47 2019 UTC vs.
Revision 1.18 by root, Sat Apr 20 16:12:53 2019 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5// C99 required 5// C99 required!
6// this is not just for comments, but also for
7// integer constant semantics,
8// sscanf format modifiers and more.
6 9
7enum { 10enum {
8 // ASN_TAG 11 // ASN_TAG
9 ASN_BOOLEAN = 0x01, 12 ASN_BOOLEAN = 0x01,
10 ASN_INTEGER32 = 0x02, 13 ASN_INTEGER = 0x02,
11 ASN_BIT_STRING = 0x03, 14 ASN_BIT_STRING = 0x03,
12 ASN_OCTET_STRING = 0x04, 15 ASN_OCTET_STRING = 0x04,
13 ASN_NULL = 0x05, 16 ASN_NULL = 0x05,
14 ASN_OBJECT_IDENTIFIER = 0x06, 17 ASN_OBJECT_IDENTIFIER = 0x06,
15 ASN_OID = 0x06, 18 ASN_OID = 0x06,
… …
77 BER_TYPE_IPADDRESS, 80 BER_TYPE_IPADDRESS,
78 BER_TYPE_CROAK, 81 BER_TYPE_CROAK,
79}; 82};
80 83
81enum { 84enum {
82 BER_CLASS = 0, 85 BER_CLASS = 0,
83 BER_TAG = 1, 86 BER_TAG = 1,
84 BER_CONSTRUCTED = 2, 87 BER_FLAGS = 2,
85 BER_DATA = 3, 88 BER_DATA = 3,
86 BER_ARRAYSIZE 89 BER_ARRAYSIZE
87}; 90};
88 91
89#define MAX_OID_STRLEN 4096 92#define MAX_OID_STRLEN 4096
90 93
… …
178 181
179 SvPVX (sv)[idx] = type; 182 SvPVX (sv)[idx] = type;
180} 183}
181 184
182static SV * 185static SV *
183profile_new () 186profile_new (void)
184{ 187{
185 SV *sv = newSVpvn ("", 0); 188 SV *sv = newSVpvn ("", 0);
186 189
187 static const struct { 190 static const struct {
188 int klass; 191 int klass;
189 int tag; 192 int tag;
190 int type; 193 int type;
191 } *celem, default_map[] = { 194 } *celem, default_map[] = {
192 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL }, 195 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },
193 { ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT }, 196 { ASN_UNIVERSAL, ASN_INTEGER , BER_TYPE_INT },
194 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL }, 197 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },
195 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID }, 198 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID },
196 { ASN_UNIVERSAL, ASN_OBJECT_DESCRIPTOR, BER_TYPE_OID },
197 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID }, 199 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
198 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL }, 200 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
201 { ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
199 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 }, 202 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },
200 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 }, 203 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },
201 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 }, 204 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },
202 }; 205 };
203 206
204 for (celem = default_map + sizeof (default_map) / sizeof (default_map [0]); celem > default_map; celem--) 207 for (celem = default_map + sizeof (default_map) / sizeof (default_map [0]); celem-- > default_map; )
205 profile_set ((void *)sv, celem->klass, celem->tag, celem->type); 208 profile_set ((profile_type *)sv, celem->klass, celem->tag, celem->type);
206 209
207 return sv_bless (newRV_noinc (sv), profile_stash); 210 return sv_bless (newRV_noinc (sv), profile_stash);
208} 211}
209 212
210///////////////////////////////////////////////////////////////////////////// 213/////////////////////////////////////////////////////////////////////////////
… …
245 248
246 return *cur++; 249 return *cur++;
247} 250}
248 251
249// get ber-encoded integer (i.e. pack "w") 252// get ber-encoded integer (i.e. pack "w")
250static U32 253static UV
251get_w (void) 254get_w (void)
252{ 255{
253 U32 res = 0; 256 UV res = 0;
254 257
255 for (;;) 258 for (;;)
256 { 259 {
257 U8 c = get_u8 (); 260 U8 c = get_u8 ();
258 res = (res << 7) | (c & 0x7f); 261 res = (res << 7) | (c & 0x7f);
… …
260 if (!(c & 0x80)) 263 if (!(c & 0x80))
261 return res; 264 return res;
262 } 265 }
263} 266}
264 267
265static U32 268static UV
266get_length (void) 269get_length (void)
267{ 270{
268 U32 res = get_u8 (); 271 UV res = get_u8 ();
269 272
270 if (res & 0x80) 273 if (res & 0x80)
271 { 274 {
272 int cnt = res & 0x7f; 275 int cnt = res & 0x7f;
273 res = 0; 276 res = 0;
… …
276 { 279 {
277 case 0: 280 case 0:
278 error ("indefinite ASN.1 lengths not supported"); 281 error ("indefinite ASN.1 lengths not supported");
279 return 0; 282 return 0;
280 283
284 //case 0x80: // indefinite length
285
286 //case 0xff: reserved
281 default: 287 default:
282 error ("ASN.1 length too long"); 288 error ("ASN.1 length too long");
283 return 0; 289 return 0;
284 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 ();
285 case 4: res = (res << 8) | get_u8 (); 295 case 4: res = (res << 8) | get_u8 ();
286 case 3: res = (res << 8) | get_u8 (); 296 case 3: res = (res << 8) | get_u8 ();
287 case 2: res = (res << 8) | get_u8 (); 297 case 2: res = (res << 8) | get_u8 ();
288 case 1: res = (res << 8) | get_u8 (); 298 case 1: res = (res << 8) | get_u8 ();
289 } 299 }
… …
291 301
292 return res; 302 return res;
293} 303}
294 304
295static SV * 305static SV *
296decode_int () 306decode_int (void)
297{ 307{
298 int len = get_length (); 308 UV len = get_length ();
299 309
300 if (len <= 0) 310 if (!len)
301 { 311 {
302 error ("integer length equal to zero"); 312 error ("invalid integer length equal to zero");
303 return 0; 313 return 0;
304 } 314 }
305 315
306 U8 *data = get_n (len); 316 U8 *data = get_n (len);
307 317
… …
319} 329}
320 330
321static SV * 331static SV *
322decode_data (void) 332decode_data (void)
323{ 333{
324 U32 len = get_length (); 334 UV len = get_length ();
325 U8 *data = get_n (len);
326 return newSVpvn ((char *)data, len); 335 return newSVpvn ((char *)get_n (len), len);
327} 336}
328 337
329// gelper for decode_object_identifier 338// helper for decode_object_identifier
330static char * 339static char *
331write_uv (char *buf, U32 u) 340write_uv (char *buf, UV u)
332{ 341{
333 // 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)
334 if (expect_true (u < 10)) 343 if (expect_true (u < 10))
335 *buf++ = u + '0'; 344 *buf++ = u + '0';
336 else 345 else
337 { 346 {
347 // this *could* be done much faster using branchless fixed-point arithmetics
338 char *beg = buf; 348 char *beg = buf;
339 349
340 do 350 do
341 { 351 {
342 *buf++ = u % 10 + '0'; 352 *buf++ = u % 10 + '0';
343 u /= 10; 353 u /= 10;
344 } 354 }
345 while (u); 355 while (u);
346 356
347 // reverse digits 357 // reverse digits
348 for (char *ptr = buf; --ptr != beg; ++beg) 358 char *ptr = buf;
359 while (--ptr > beg)
349 { 360 {
350 char c = *ptr; 361 char c = *ptr;
351 *ptr = *beg; 362 *ptr = *beg;
352 *beg = c; 363 *beg = c;
364 ++beg;
353 } 365 }
354 } 366 }
355 367
356 return buf; 368 return buf;
357} 369}
358 370
359static SV * 371static SV *
360decode_oid (int relative) 372decode_oid (int relative)
361{ 373{
362 U32 len = get_length (); 374 UV len = get_length ();
363 375
364 if (len <= 0) 376 if (len <= 0)
365 { 377 {
366 error ("OBJECT IDENTIFIER length equal to zero"); 378 error ("OBJECT IDENTIFIER length equal to zero");
367 return &PL_sv_undef; 379 return &PL_sv_undef;
368 } 380 }
369 381
370 U8 *end = cur + len; 382 U8 *end = cur + len;
371 U32 w = get_w (); 383 UV w = get_w ();
372 384
373 static char oid[MAX_OID_STRLEN]; // must be static 385 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack
374 char *app = oid; 386 char *app = oid;
375 387
376 if (relative) 388 if (relative)
377 app = write_uv (app, w); 389 app = write_uv (app, w);
378 else 390 else if (w < 2 * 40)
379 { 391 {
380 app = write_uv (app, (U8)w / 40); 392 app = write_uv (app, (U8)w / 40);
381 *app++ = '.'; 393 *app++ = '.';
382 app = write_uv (app, (U8)w % 40); 394 app = write_uv (app, (U8)w % 40);
383 } 395 }
396 else
397 {
398 app = write_uv (app, 2);
399 *app++ = '.';
400 app = write_uv (app, w - 2 * 40);
401 }
384 402
403 while (cur < end)
404 {
385 // we assume an oid component is never > 64 bytes 405 // we assume an oid component is never > 64 digits
386 while (cur < end && oid + sizeof (oid) - app > 64) 406 if (oid + sizeof (oid) - app < 64)
387 { 407 croak ("BER_TYPE_OID to long to decode");
408
388 w = get_w (); 409 w = get_w ();
389 *app++ = '.'; 410 *app++ = '.';
390 app = write_uv (app, w); 411 app = write_uv (app, w);
391 } 412 }
392 413
… …
397static SV * 418static SV *
398decode_ucs (int chrsize) 419decode_ucs (int chrsize)
399{ 420{
400 SV *res = NEWSV (0, 0); 421 SV *res = NEWSV (0, 0);
401 422
402 U32 len = get_length (); 423 UV len = get_length ();
403 424
404 if (len & (chrsize - 1)) 425 if (len & (chrsize - 1))
405 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);
406 427
407 while (len) 428 while (len)
… …
428 449
429 return res; 450 return res;
430} 451}
431 452
432static SV * 453static SV *
433decode_ber () 454decode_ber (void)
434{ 455{
435 int identifier = get_u8 (); 456 int identifier = get_u8 ();
436 457
437 SV *res; 458 SV *res;
438 459
… …
446 if (tag == ASN_TAG_BER) 467 if (tag == ASN_TAG_BER)
447 tag = get_w (); 468 tag = get_w ();
448 469
449 if (constructed) 470 if (constructed)
450 { 471 {
451 U32 len = get_length (); 472 UV len = get_length ();
452 U32 seqend = (cur - buf) + len; 473 UV seqend = (cur - buf) + len;
453 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 474 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
454 475
455 while (cur < buf + seqend) 476 while (cur < buf + seqend)
456 av_push (av, decode_ber ()); 477 av_push (av, decode_ber ());
457 478
… …
462 } 483 }
463 else 484 else
464 switch (profile_lookup (cur_profile, klass, tag)) 485 switch (profile_lookup (cur_profile, klass, tag))
465 { 486 {
466 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
467 res = &PL_sv_undef; 494 res = &PL_sv_undef;
495 }
468 break; 496 break;
469 497
470 case BER_TYPE_BOOL: 498 case BER_TYPE_BOOL:
471 { 499 {
472 U32 len = get_length (); 500 UV len = get_length ();
473 501
474 if (len != 1) 502 if (len != 1)
475 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len); 503 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len);
476 504
477 res = newSVcacheint (get_u8 () ? 0 : 1); 505 res = newSVcacheint (!!get_u8 ());
478 } 506 }
479 break; 507 break;
480 508
481 case BER_TYPE_OID: 509 case BER_TYPE_OID:
482 res = decode_oid (0); 510 res = decode_oid (0);
… …
499 res = decode_data (); 527 res = decode_data ();
500 break; 528 break;
501 529
502 case BER_TYPE_IPADDRESS: 530 case BER_TYPE_IPADDRESS:
503 { 531 {
504 U32 len = get_length (); 532 UV len = get_length ();
505 533
506 if (len != 4) 534 if (len != 4)
507 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 535 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len);
508 536
509 U8 c1 = get_u8 (); 537 U8 c1 = get_u8 ();
… …
529 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 557 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
530 } 558 }
531 559
532 AV *av = newAV (); 560 AV *av = newAV ();
533 av_fill (av, BER_ARRAYSIZE - 1); 561 av_fill (av, BER_ARRAYSIZE - 1);
534 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 562 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
535 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 563 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
536 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 564 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
537 AvARRAY (av)[BER_DATA ] = res; 565 AvARRAY (av)[BER_DATA ] = res;
538 566
539 return newRV_noinc ((SV *)av); 567 return newRV_noinc ((SV *)av);
540} 568}
541 569
542///////////////////////////////////////////////////////////////////////////// 570/////////////////////////////////////////////////////////////////////////////
… …
595 need (1); 623 need (1);
596 *cur++ = val; 624 *cur++ = val;
597} 625}
598 626
599static void 627static void
600put_w_nocheck (U32 val) 628put_w_nocheck (UV val)
601{ 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
602 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 637 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
603 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 638 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
604 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 639 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
605 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 640 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
606 *cur = val & 0x7f; cur += 1; 641 *cur = val & 0x7f; cur += 1;
607} 642}
608 643
609static void 644static void
610put_w (U32 val) 645put_w (UV val)
611{ 646{
612 need (5); // we only handle up to 5 bytes 647 need (5); // we only handle up to 5 bytes
613 648
614 put_w_nocheck (val); 649 put_w_nocheck (val);
615} 650}
616 651
617static U8 * 652static U8 *
618put_length_at (U32 val, U8 *cur) 653put_length_at (UV val, U8 *cur)
619{ 654{
620 if (val < 0x7fU) 655 if (val < 0x7fU)
621 *cur++ = val; 656 *cur++ = val;
622 else 657 else
623 { 658 {
624 U8 *lenb = cur++; 659 U8 *lenb = cur++;
625 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
626 *cur = val >> 24; cur += *cur > 0; 667 *cur = val >> 24; cur += *cur > 0;
627 *cur = val >> 16; cur += *cur > 0; 668 *cur = val >> 16; cur += *cur > 0;
628 *cur = val >> 8; cur += *cur > 0; 669 *cur = val >> 8; cur += *cur > 0;
629 *cur = val ; cur += 1; 670 *cur = val ; cur += 1;
630 671
… …
633 674
634 return cur; 675 return cur;
635} 676}
636 677
637static void 678static void
638put_length (U32 val) 679put_length (UV val)
639{ 680{
640 need (5 + val); 681 need (5 + val);
641 cur = put_length_at (val, cur); 682 cur = put_length_at (val, cur);
642} 683}
643 684
644// return how many bytes the encoded length requires 685// return how many bytes the encoded length requires
645static int length_length (U32 val) 686static int length_length (UV val)
646{ 687{
647 return val < 0x7fU 688 return val < 0x7fU
648 ? 1 689 ? 1
649 : 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 ;
650} 701}
651 702
652static void 703static void
653encode_data (const char *ptr, STRLEN len) 704encode_data (const char *ptr, STRLEN len)
654{ 705{
… …
716 767
717 *lenb = cur - lenb - 1; 768 *lenb = cur - lenb - 1;
718} 769}
719 770
720// we don't know the length yet, so we optimistically 771// we don't know the length yet, so we optimistically
721// assume the length will need one octet later. if that 772// assume the length will need one octet later. If that
722// turns out to be wrong, we memove as needed. 773// turns out to be wrong, we memmove as needed.
723// mark the beginning 774// mark the beginning
724static STRLEN 775static STRLEN
725len_fixup_mark () 776len_fixup_mark (void)
726{ 777{
727 return cur++ - buf; 778 return cur++ - buf;
728} 779}
729 780
730// patch up the length 781// patch up the length
… …
839{ 890{
840 AV *av = ber_tuple (tuple); 891 AV *av = ber_tuple (tuple);
841 892
842 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 893 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
843 int tag = SvIV (AvARRAY (av)[BER_TAG]); 894 int tag = SvIV (AvARRAY (av)[BER_TAG]);
844 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 895 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
845 SV *data = AvARRAY (av)[BER_DATA]; 896 SV *data = AvARRAY (av)[BER_DATA];
846 897
847 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 898 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
848 899
849 if (expect_false (tag >= ASN_TAG_BER)) 900 if (expect_false (tag >= ASN_TAG_BER))
… …
868 int fill = AvFILL (av); 919 int fill = AvFILL (av);
869 920
870 if (expect_false (SvRMAGICAL (av))) 921 if (expect_false (SvRMAGICAL (av)))
871 croak ("BER constructed data must not be tied"); 922 croak ("BER constructed data must not be tied");
872 923
924 int i;
873 for (int i = 0; i <= fill; ++i) 925 for (i = 0; i <= fill; ++i)
874 encode_ber (AvARRAY (av)[i]); 926 encode_ber (AvARRAY (av)[i]);
875 927
876 len_fixup (mark); 928 len_fixup (mark);
877 } 929 }
878 else 930 else
… …
882 put_length (0); 934 put_length (0);
883 break; 935 break;
884 936
885 case BER_TYPE_BOOL: 937 case BER_TYPE_BOOL:
886 put_length (1); 938 put_length (1);
887 *cur++ = SvTRUE (data) ? 0xff : 0x00; 939 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
888 break; 940 break;
889 941
890 case BER_TYPE_OID: 942 case BER_TYPE_OID:
891 encode_oid (data, 0); 943 encode_oid (data, 0);
892 break; 944 break;
… …
955 const char *name; 1007 const char *name;
956 IV iv; 1008 IV iv;
957 } *civ, const_iv[] = { 1009 } *civ, const_iv[] = {
958#define const_iv(name) { # name, name }, 1010#define const_iv(name) { # name, name },
959 const_iv (ASN_BOOLEAN) 1011 const_iv (ASN_BOOLEAN)
960 const_iv (ASN_INTEGER32) 1012 const_iv (ASN_INTEGER)
961 const_iv (ASN_BIT_STRING) 1013 const_iv (ASN_BIT_STRING)
962 const_iv (ASN_OCTET_STRING) 1014 const_iv (ASN_OCTET_STRING)
963 const_iv (ASN_NULL) 1015 const_iv (ASN_NULL)
964 const_iv (ASN_OBJECT_IDENTIFIER) 1016 const_iv (ASN_OBJECT_IDENTIFIER)
965 const_iv (ASN_OBJECT_DESCRIPTOR) 1017 const_iv (ASN_OBJECT_DESCRIPTOR)
… …
994 const_iv (ASN_CONTEXT) 1046 const_iv (ASN_CONTEXT)
995 const_iv (ASN_PRIVATE) 1047 const_iv (ASN_PRIVATE)
996 1048
997 const_iv (BER_CLASS) 1049 const_iv (BER_CLASS)
998 const_iv (BER_TAG) 1050 const_iv (BER_TAG)
999 const_iv (BER_CONSTRUCTED) 1051 const_iv (BER_FLAGS)
1000 const_iv (BER_DATA) 1052 const_iv (BER_DATA)
1001 1053
1002 const_iv (BER_TYPE_BYTES) 1054 const_iv (BER_TYPE_BYTES)
1003 const_iv (BER_TYPE_UTF8) 1055 const_iv (BER_TYPE_UTF8)
1004 const_iv (BER_TYPE_UCS2) 1056 const_iv (BER_TYPE_UCS2)
… …
1037 RETVAL = decode_ber (); 1089 RETVAL = decode_ber ();
1038} 1090}
1039 OUTPUT: RETVAL 1091 OUTPUT: RETVAL
1040 1092
1041void 1093void
1042ber_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)
1043 PPCODE: 1095 PPCODE:
1044{ 1096{
1045 if (!SvOK (tuple)) 1097 if (!SvOK (tuple))
1046 XSRETURN_NO; 1098 XSRETURN_NO;
1047 1099
… …
1049 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1101 croak ("ber_is: tuple must be BER tuple (array-ref)");
1050 1102
1051 AV *av = (AV *)SvRV (tuple); 1103 AV *av = (AV *)SvRV (tuple);
1052 1104
1053 XPUSHs ( 1105 XPUSHs (
1054 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1106 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1055 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1107 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1056 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1108 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1057 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1109 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1058 ? &PL_sv_yes : &PL_sv_undef); 1110 ? &PL_sv_yes : &PL_sv_undef);
1059} 1111}
1060 1112
1061void 1113void
1062ber_is_seq (SV *tuple) 1114ber_is_seq (SV *tuple)
… …
1066 XSRETURN_UNDEF; 1118 XSRETURN_UNDEF;
1067 1119
1068 AV *av = ber_tuple (tuple); 1120 AV *av = ber_tuple (tuple);
1069 1121
1070 XPUSHs ( 1122 XPUSHs (
1071 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1123 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1072 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1124 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1073 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1125 && SvIV (AvARRAY (av)[BER_FLAGS])
1074 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1126 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1075} 1127}
1076 1128
1077void 1129void
1078ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1130ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1079 PPCODE: 1131 PPCODE:
1080{ 1132{
1081 if (!SvOK (tuple)) 1133 if (!SvOK (tuple))
1082 XSRETURN_NO; 1134 XSRETURN_NO;
1083 1135
1084 AV *av = ber_tuple (tuple); 1136 AV *av = ber_tuple (tuple);
1085 1137
1086 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1138 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1087 1139
1088 XPUSHs ( 1140 XPUSHs (
1089 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1141 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1090 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1142 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1091 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1143 && !SvIV (AvARRAY (av)[BER_FLAGS])
1092 && (!SvOK (value) || data == SvIV (value)) 1144 && (!SvOK (value) || data == SvUV (value))
1093 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1145 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1094 : &PL_sv_undef); 1146 : &PL_sv_undef);
1095} 1147}
1096 1148
1097void 1149void
1098ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1150ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
… …
1102 XSRETURN_NO; 1154 XSRETURN_NO;
1103 1155
1104 AV *av = ber_tuple (tuple); 1156 AV *av = ber_tuple (tuple);
1105 1157
1106 XPUSHs ( 1158 XPUSHs (
1107 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1159 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1108 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1160 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1109 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1161 && !SvIV (AvARRAY (av)[BER_FLAGS])
1110 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1162 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1111 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1163 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1112} 1164}
1113 1165
1114############################################################################# 1166#############################################################################
… …
1127 SvCUR_set (buf_sv, cur - buf); 1179 SvCUR_set (buf_sv, cur - buf);
1128 XPUSHs (buf_sv); 1180 XPUSHs (buf_sv);
1129} 1181}
1130 1182
1131SV * 1183SV *
1132ber_i32 (IV iv) 1184ber_int (SV *sv)
1133 CODE: 1185 CODE:
1134{ 1186{
1135 AV *av = newAV (); 1187 AV *av = newAV ();
1136 av_fill (av, BER_ARRAYSIZE - 1); 1188 av_fill (av, BER_ARRAYSIZE - 1);
1137 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1189 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1138 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1190 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1139 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1191 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1140 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1192 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1141 RETVAL = newRV_noinc ((SV *)av); 1193 RETVAL = newRV_noinc ((SV *)av);
1142} 1194}
1143 OUTPUT: RETVAL 1195 OUTPUT: RETVAL
1144 1196
1145# TODO: not arrayref, but elements? 1197# TODO: not arrayref, but elements?
… …
1147ber_seq (SV *arrayref) 1199ber_seq (SV *arrayref)
1148 CODE: 1200 CODE:
1149{ 1201{
1150 AV *av = newAV (); 1202 AV *av = newAV ();
1151 av_fill (av, BER_ARRAYSIZE - 1); 1203 av_fill (av, BER_ARRAYSIZE - 1);
1152 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1204 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1153 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1205 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1154 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1206 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1155 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1207 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1156 RETVAL = newRV_noinc ((SV *)av); 1208 RETVAL = newRV_noinc ((SV *)av);
1157} 1209}
1158 OUTPUT: RETVAL 1210 OUTPUT: RETVAL
1159 1211
1160MODULE = 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