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.19 by root, Sat Apr 20 16:34:34 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
268// get_w, but disallow padding
265static U32 269static UV
270get_w_nopad (void)
271{
272 U8 first = get_u8 ();
273
274 if (first == 0x80)
275 error ("illegal BER padding");
276
277 --cur;
278
279 return get_w ();
280}
281
282static UV
266get_length (void) 283get_length (void)
267{ 284{
268 U32 res = get_u8 (); 285 UV res = get_u8 ();
269 286
270 if (res & 0x80) 287 if (res & 0x80)
271 { 288 {
272 int cnt = res & 0x7f; 289 int cnt = res & 0x7f;
273 res = 0; 290 res = 0;
… …
276 { 293 {
277 case 0: 294 case 0:
278 error ("indefinite ASN.1 lengths not supported"); 295 error ("indefinite ASN.1 lengths not supported");
279 return 0; 296 return 0;
280 297
298 //case 0x80: // indefinite length
299
300 //case 0xff: reserved
281 default: 301 default:
282 error ("ASN.1 length too long"); 302 error ("ASN.1 length too long");
283 return 0; 303 return 0;
284 304
305 case 8: res = (res << 8) | get_u8 ();
306 case 7: res = (res << 8) | get_u8 ();
307 case 6: res = (res << 8) | get_u8 ();
308 case 5: res = (res << 8) | get_u8 ();
285 case 4: res = (res << 8) | get_u8 (); 309 case 4: res = (res << 8) | get_u8 ();
286 case 3: res = (res << 8) | get_u8 (); 310 case 3: res = (res << 8) | get_u8 ();
287 case 2: res = (res << 8) | get_u8 (); 311 case 2: res = (res << 8) | get_u8 ();
288 case 1: res = (res << 8) | get_u8 (); 312 case 1: res = (res << 8) | get_u8 ();
289 } 313 }
… …
291 315
292 return res; 316 return res;
293} 317}
294 318
295static SV * 319static SV *
296decode_int () 320decode_int (void)
297{ 321{
298 int len = get_length (); 322 UV len = get_length ();
299 323
300 if (len <= 0) 324 if (!len)
301 { 325 {
302 error ("integer length equal to zero"); 326 error ("invalid integer length equal to zero");
303 return 0; 327 return 0;
304 } 328 }
305 329
306 U8 *data = get_n (len); 330 U8 *data = get_n (len);
307 331
… …
319} 343}
320 344
321static SV * 345static SV *
322decode_data (void) 346decode_data (void)
323{ 347{
324 U32 len = get_length (); 348 UV len = get_length ();
325 U8 *data = get_n (len);
326 return newSVpvn ((char *)data, len); 349 return newSVpvn ((char *)get_n (len), len);
327} 350}
328 351
329// gelper for decode_object_identifier 352// helper for decode_object_identifier
330static char * 353static char *
331write_uv (char *buf, U32 u) 354write_uv (char *buf, UV u)
332{ 355{
333 // the one-digit case is absolutely predominant, so this pays off (hopefully) 356 // the one-digit case is absolutely predominant, so this pays off (hopefully)
334 if (expect_true (u < 10)) 357 if (expect_true (u < 10))
335 *buf++ = u + '0'; 358 *buf++ = u + '0';
336 else 359 else
337 { 360 {
361 // this *could* be done much faster using branchless fixed-point arithmetics
338 char *beg = buf; 362 char *beg = buf;
339 363
340 do 364 do
341 { 365 {
342 *buf++ = u % 10 + '0'; 366 *buf++ = u % 10 + '0';
343 u /= 10; 367 u /= 10;
344 } 368 }
345 while (u); 369 while (u);
346 370
347 // reverse digits 371 // reverse digits
348 for (char *ptr = buf; --ptr != beg; ++beg) 372 char *ptr = buf;
373 while (--ptr > beg)
349 { 374 {
350 char c = *ptr; 375 char c = *ptr;
351 *ptr = *beg; 376 *ptr = *beg;
352 *beg = c; 377 *beg = c;
378 ++beg;
353 } 379 }
354 } 380 }
355 381
356 return buf; 382 return buf;
357} 383}
358 384
359static SV * 385static SV *
360decode_oid (int relative) 386decode_oid (int relative)
361{ 387{
362 U32 len = get_length (); 388 UV len = get_length ();
363 389
364 if (len <= 0) 390 if (len <= 0)
365 { 391 {
366 error ("OBJECT IDENTIFIER length equal to zero"); 392 error ("OBJECT IDENTIFIER length equal to zero");
367 return &PL_sv_undef; 393 return &PL_sv_undef;
368 } 394 }
369 395
370 U8 *end = cur + len; 396 U8 *end = cur + len;
371 U32 w = get_w (); 397 UV w = get_w_nopad ();
372 398
373 static char oid[MAX_OID_STRLEN]; // must be static 399 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack
374 char *app = oid; 400 char *app = oid;
375 401
376 if (relative) 402 if (relative)
377 app = write_uv (app, w); 403 app = write_uv (app, w);
378 else 404 else if (w < 2 * 40)
379 { 405 {
380 app = write_uv (app, (U8)w / 40); 406 app = write_uv (app, (U8)w / 40);
381 *app++ = '.'; 407 *app++ = '.';
382 app = write_uv (app, (U8)w % 40); 408 app = write_uv (app, (U8)w % 40);
383 } 409 }
410 else
411 {
412 app = write_uv (app, 2);
413 *app++ = '.';
414 app = write_uv (app, w - 2 * 40);
415 }
384 416
417 while (cur < end)
418 {
385 // we assume an oid component is never > 64 bytes 419 // we assume an oid component is never > 64 digits
386 while (cur < end && oid + sizeof (oid) - app > 64) 420 if (oid + sizeof (oid) - app < 64)
387 { 421 croak ("BER_TYPE_OID to long to decode");
422
388 w = get_w (); 423 w = get_w_nopad ();
389 *app++ = '.'; 424 *app++ = '.';
390 app = write_uv (app, w); 425 app = write_uv (app, w);
391 } 426 }
392 427
393 return newSVpvn (oid, app - oid); 428 return newSVpvn (oid, app - oid);
… …
397static SV * 432static SV *
398decode_ucs (int chrsize) 433decode_ucs (int chrsize)
399{ 434{
400 SV *res = NEWSV (0, 0); 435 SV *res = NEWSV (0, 0);
401 436
402 U32 len = get_length (); 437 UV len = get_length ();
403 438
404 if (len & (chrsize - 1)) 439 if (len & (chrsize - 1))
405 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len); 440 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
406 441
407 while (len) 442 while (len)
… …
428 463
429 return res; 464 return res;
430} 465}
431 466
432static SV * 467static SV *
433decode_ber () 468decode_ber (void)
434{ 469{
435 int identifier = get_u8 (); 470 int identifier = get_u8 ();
436 471
437 SV *res; 472 SV *res;
438 473
… …
446 if (tag == ASN_TAG_BER) 481 if (tag == ASN_TAG_BER)
447 tag = get_w (); 482 tag = get_w ();
448 483
449 if (constructed) 484 if (constructed)
450 { 485 {
451 U32 len = get_length (); 486 UV len = get_length ();
452 U32 seqend = (cur - buf) + len; 487 UV seqend = (cur - buf) + len;
453 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 488 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
454 489
455 while (cur < buf + seqend) 490 while (cur < buf + seqend)
456 av_push (av, decode_ber ()); 491 av_push (av, decode_ber ());
457 492
… …
462 } 497 }
463 else 498 else
464 switch (profile_lookup (cur_profile, klass, tag)) 499 switch (profile_lookup (cur_profile, klass, tag))
465 { 500 {
466 case BER_TYPE_NULL: 501 case BER_TYPE_NULL:
502 {
503 UV len = get_length ();
504
505 if (len)
506 croak ("BER_TYPE_NULL value with non-zero length %d encountered", len);
507
467 res = &PL_sv_undef; 508 res = &PL_sv_undef;
509 }
468 break; 510 break;
469 511
470 case BER_TYPE_BOOL: 512 case BER_TYPE_BOOL:
471 { 513 {
472 U32 len = get_length (); 514 UV len = get_length ();
473 515
474 if (len != 1) 516 if (len != 1)
475 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len); 517 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len);
476 518
477 res = newSVcacheint (get_u8 () ? 0 : 1); 519 res = newSVcacheint (!!get_u8 ());
478 } 520 }
479 break; 521 break;
480 522
481 case BER_TYPE_OID: 523 case BER_TYPE_OID:
482 res = decode_oid (0); 524 res = decode_oid (0);
… …
499 res = decode_data (); 541 res = decode_data ();
500 break; 542 break;
501 543
502 case BER_TYPE_IPADDRESS: 544 case BER_TYPE_IPADDRESS:
503 { 545 {
504 U32 len = get_length (); 546 UV len = get_length ();
505 547
506 if (len != 4) 548 if (len != 4)
507 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 549 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len);
508 550
509 U8 c1 = get_u8 (); 551 U8 c1 = get_u8 ();
… …
529 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 571 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
530 } 572 }
531 573
532 AV *av = newAV (); 574 AV *av = newAV ();
533 av_fill (av, BER_ARRAYSIZE - 1); 575 av_fill (av, BER_ARRAYSIZE - 1);
534 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 576 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
535 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 577 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
536 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 578 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
537 AvARRAY (av)[BER_DATA ] = res; 579 AvARRAY (av)[BER_DATA ] = res;
538 580
539 return newRV_noinc ((SV *)av); 581 return newRV_noinc ((SV *)av);
540} 582}
541 583
542///////////////////////////////////////////////////////////////////////////// 584/////////////////////////////////////////////////////////////////////////////
… …
595 need (1); 637 need (1);
596 *cur++ = val; 638 *cur++ = val;
597} 639}
598 640
599static void 641static void
600put_w_nocheck (U32 val) 642put_w_nocheck (UV val)
601{ 643{
644#if UVSIZE > 4
645 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
646 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
647 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
648 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
649 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
650#endif
602 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 651 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
603 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 652 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
604 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 653 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
605 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 654 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
606 *cur = val & 0x7f; cur += 1; 655 *cur = val & 0x7f; cur += 1;
607} 656}
608 657
609static void 658static void
610put_w (U32 val) 659put_w (UV val)
611{ 660{
612 need (5); // we only handle up to 5 bytes 661 need (5); // we only handle up to 5 bytes
613 662
614 put_w_nocheck (val); 663 put_w_nocheck (val);
615} 664}
616 665
617static U8 * 666static U8 *
618put_length_at (U32 val, U8 *cur) 667put_length_at (UV val, U8 *cur)
619{ 668{
620 if (val < 0x7fU) 669 if (val < 0x7fU)
621 *cur++ = val; 670 *cur++ = val;
622 else 671 else
623 { 672 {
624 U8 *lenb = cur++; 673 U8 *lenb = cur++;
625 674
675#if UVSIZE > 4
676 *cur = val >> 56; cur += *cur > 0;
677 *cur = val >> 48; cur += *cur > 0;
678 *cur = val >> 40; cur += *cur > 0;
679 *cur = val >> 32; cur += *cur > 0;
680#endif
626 *cur = val >> 24; cur += *cur > 0; 681 *cur = val >> 24; cur += *cur > 0;
627 *cur = val >> 16; cur += *cur > 0; 682 *cur = val >> 16; cur += *cur > 0;
628 *cur = val >> 8; cur += *cur > 0; 683 *cur = val >> 8; cur += *cur > 0;
629 *cur = val ; cur += 1; 684 *cur = val ; cur += 1;
630 685
… …
633 688
634 return cur; 689 return cur;
635} 690}
636 691
637static void 692static void
638put_length (U32 val) 693put_length (UV val)
639{ 694{
640 need (5 + val); 695 need (5 + val);
641 cur = put_length_at (val, cur); 696 cur = put_length_at (val, cur);
642} 697}
643 698
644// return how many bytes the encoded length requires 699// return how many bytes the encoded length requires
645static int length_length (U32 val) 700static int length_length (UV val)
646{ 701{
647 return val < 0x7fU 702 return val < 0x7fU
648 ? 1 703 ? 1
649 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 704 : 2
705 + (val > 0xffU)
706 + (val > 0xffffU)
707 + (val > 0xffffffU)
708#if UVSIZE > 4
709 + (val > 0xffffffffU)
710 + (val > 0xffffffffffU)
711 + (val > 0xffffffffffffU)
712 + (val > 0xffffffffffffffU)
713#endif
714 ;
650} 715}
651 716
652static void 717static void
653encode_data (const char *ptr, STRLEN len) 718encode_data (const char *ptr, STRLEN len)
654{ 719{
… …
716 781
717 *lenb = cur - lenb - 1; 782 *lenb = cur - lenb - 1;
718} 783}
719 784
720// we don't know the length yet, so we optimistically 785// we don't know the length yet, so we optimistically
721// assume the length will need one octet later. if that 786// assume the length will need one octet later. If that
722// turns out to be wrong, we memove as needed. 787// turns out to be wrong, we memmove as needed.
723// mark the beginning 788// mark the beginning
724static STRLEN 789static STRLEN
725len_fixup_mark () 790len_fixup_mark (void)
726{ 791{
727 return cur++ - buf; 792 return cur++ - buf;
728} 793}
729 794
730// patch up the length 795// patch up the length
… …
839{ 904{
840 AV *av = ber_tuple (tuple); 905 AV *av = ber_tuple (tuple);
841 906
842 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 907 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
843 int tag = SvIV (AvARRAY (av)[BER_TAG]); 908 int tag = SvIV (AvARRAY (av)[BER_TAG]);
844 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 909 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
845 SV *data = AvARRAY (av)[BER_DATA]; 910 SV *data = AvARRAY (av)[BER_DATA];
846 911
847 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 912 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
848 913
849 if (expect_false (tag >= ASN_TAG_BER)) 914 if (expect_false (tag >= ASN_TAG_BER))
… …
868 int fill = AvFILL (av); 933 int fill = AvFILL (av);
869 934
870 if (expect_false (SvRMAGICAL (av))) 935 if (expect_false (SvRMAGICAL (av)))
871 croak ("BER constructed data must not be tied"); 936 croak ("BER constructed data must not be tied");
872 937
938 int i;
873 for (int i = 0; i <= fill; ++i) 939 for (i = 0; i <= fill; ++i)
874 encode_ber (AvARRAY (av)[i]); 940 encode_ber (AvARRAY (av)[i]);
875 941
876 len_fixup (mark); 942 len_fixup (mark);
877 } 943 }
878 else 944 else
… …
882 put_length (0); 948 put_length (0);
883 break; 949 break;
884 950
885 case BER_TYPE_BOOL: 951 case BER_TYPE_BOOL:
886 put_length (1); 952 put_length (1);
887 *cur++ = SvTRUE (data) ? 0xff : 0x00; 953 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
888 break; 954 break;
889 955
890 case BER_TYPE_OID: 956 case BER_TYPE_OID:
891 encode_oid (data, 0); 957 encode_oid (data, 0);
892 break; 958 break;
… …
955 const char *name; 1021 const char *name;
956 IV iv; 1022 IV iv;
957 } *civ, const_iv[] = { 1023 } *civ, const_iv[] = {
958#define const_iv(name) { # name, name }, 1024#define const_iv(name) { # name, name },
959 const_iv (ASN_BOOLEAN) 1025 const_iv (ASN_BOOLEAN)
960 const_iv (ASN_INTEGER32) 1026 const_iv (ASN_INTEGER)
961 const_iv (ASN_BIT_STRING) 1027 const_iv (ASN_BIT_STRING)
962 const_iv (ASN_OCTET_STRING) 1028 const_iv (ASN_OCTET_STRING)
963 const_iv (ASN_NULL) 1029 const_iv (ASN_NULL)
964 const_iv (ASN_OBJECT_IDENTIFIER) 1030 const_iv (ASN_OBJECT_IDENTIFIER)
965 const_iv (ASN_OBJECT_DESCRIPTOR) 1031 const_iv (ASN_OBJECT_DESCRIPTOR)
… …
994 const_iv (ASN_CONTEXT) 1060 const_iv (ASN_CONTEXT)
995 const_iv (ASN_PRIVATE) 1061 const_iv (ASN_PRIVATE)
996 1062
997 const_iv (BER_CLASS) 1063 const_iv (BER_CLASS)
998 const_iv (BER_TAG) 1064 const_iv (BER_TAG)
999 const_iv (BER_CONSTRUCTED) 1065 const_iv (BER_FLAGS)
1000 const_iv (BER_DATA) 1066 const_iv (BER_DATA)
1001 1067
1002 const_iv (BER_TYPE_BYTES) 1068 const_iv (BER_TYPE_BYTES)
1003 const_iv (BER_TYPE_UTF8) 1069 const_iv (BER_TYPE_UTF8)
1004 const_iv (BER_TYPE_UCS2) 1070 const_iv (BER_TYPE_UCS2)
… …
1037 RETVAL = decode_ber (); 1103 RETVAL = decode_ber ();
1038} 1104}
1039 OUTPUT: RETVAL 1105 OUTPUT: RETVAL
1040 1106
1041void 1107void
1042ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &PL_sv_undef, SV *data = &PL_sv_undef) 1108ber_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: 1109 PPCODE:
1044{ 1110{
1045 if (!SvOK (tuple)) 1111 if (!SvOK (tuple))
1046 XSRETURN_NO; 1112 XSRETURN_NO;
1047 1113
… …
1049 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1115 croak ("ber_is: tuple must be BER tuple (array-ref)");
1050 1116
1051 AV *av = (AV *)SvRV (tuple); 1117 AV *av = (AV *)SvRV (tuple);
1052 1118
1053 XPUSHs ( 1119 XPUSHs (
1054 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1120 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1055 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1121 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1056 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1122 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1057 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1123 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1058 ? &PL_sv_yes : &PL_sv_undef); 1124 ? &PL_sv_yes : &PL_sv_undef);
1059} 1125}
1060 1126
1061void 1127void
1062ber_is_seq (SV *tuple) 1128ber_is_seq (SV *tuple)
… …
1066 XSRETURN_UNDEF; 1132 XSRETURN_UNDEF;
1067 1133
1068 AV *av = ber_tuple (tuple); 1134 AV *av = ber_tuple (tuple);
1069 1135
1070 XPUSHs ( 1136 XPUSHs (
1071 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1137 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1072 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1138 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1073 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1139 && SvIV (AvARRAY (av)[BER_FLAGS])
1074 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1140 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1075} 1141}
1076 1142
1077void 1143void
1078ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1144ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1079 PPCODE: 1145 PPCODE:
1080{ 1146{
1081 if (!SvOK (tuple)) 1147 if (!SvOK (tuple))
1082 XSRETURN_NO; 1148 XSRETURN_NO;
1083 1149
1084 AV *av = ber_tuple (tuple); 1150 AV *av = ber_tuple (tuple);
1085 1151
1086 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1152 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1087 1153
1088 XPUSHs ( 1154 XPUSHs (
1089 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1155 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1090 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1156 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1091 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1157 && !SvIV (AvARRAY (av)[BER_FLAGS])
1092 && (!SvOK (value) || data == SvIV (value)) 1158 && (!SvOK (value) || data == SvUV (value))
1093 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1159 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1094 : &PL_sv_undef); 1160 : &PL_sv_undef);
1095} 1161}
1096 1162
1097void 1163void
1098ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1164ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
… …
1102 XSRETURN_NO; 1168 XSRETURN_NO;
1103 1169
1104 AV *av = ber_tuple (tuple); 1170 AV *av = ber_tuple (tuple);
1105 1171
1106 XPUSHs ( 1172 XPUSHs (
1107 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1173 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1108 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1174 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1109 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1175 && !SvIV (AvARRAY (av)[BER_FLAGS])
1110 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1176 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1111 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1177 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1112} 1178}
1113 1179
1114############################################################################# 1180#############################################################################
… …
1127 SvCUR_set (buf_sv, cur - buf); 1193 SvCUR_set (buf_sv, cur - buf);
1128 XPUSHs (buf_sv); 1194 XPUSHs (buf_sv);
1129} 1195}
1130 1196
1131SV * 1197SV *
1132ber_i32 (IV iv) 1198ber_int (SV *sv)
1133 CODE: 1199 CODE:
1134{ 1200{
1135 AV *av = newAV (); 1201 AV *av = newAV ();
1136 av_fill (av, BER_ARRAYSIZE - 1); 1202 av_fill (av, BER_ARRAYSIZE - 1);
1137 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1203 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1138 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1204 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1139 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1205 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1140 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1206 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1141 RETVAL = newRV_noinc ((SV *)av); 1207 RETVAL = newRV_noinc ((SV *)av);
1142} 1208}
1143 OUTPUT: RETVAL 1209 OUTPUT: RETVAL
1144 1210
1145# TODO: not arrayref, but elements? 1211# TODO: not arrayref, but elements?
… …
1147ber_seq (SV *arrayref) 1213ber_seq (SV *arrayref)
1148 CODE: 1214 CODE:
1149{ 1215{
1150 AV *av = newAV (); 1216 AV *av = newAV ();
1151 av_fill (av, BER_ARRAYSIZE - 1); 1217 av_fill (av, BER_ARRAYSIZE - 1);
1152 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1218 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1153 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1219 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1154 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1220 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1155 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1221 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1156 RETVAL = newRV_noinc ((SV *)av); 1222 RETVAL = newRV_noinc ((SV *)av);
1157} 1223}
1158 OUTPUT: RETVAL 1224 OUTPUT: RETVAL
1159 1225
1160MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1226MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

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