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.11 by root, Sat Apr 20 12:25:23 2019 UTC vs.
Revision 1.20 by root, Sat Apr 20 17:04:35 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
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;
257 U8 c = get_u8 ();
258
259 if (expect_false (c == 0x80))
260 error ("illegal BER padding (X.690 8.1.2.4.2, 8.19.2)");
254 261
255 for (;;) 262 for (;;)
256 { 263 {
257 U8 c = get_u8 ();
258 res = (res << 7) | (c & 0x7f); 264 res = (res << 7) | (c & 0x7f);
259 265
260 if (!(c & 0x80)) 266 if (!(c & 0x80))
261 return res; 267 return res;
262 }
263}
264 268
269 c = get_u8 ();
270 }
271}
272
265static U32 273static UV
266get_length (void) 274get_length (void)
267{ 275{
268 U32 res = get_u8 (); 276 UV res = get_u8 ();
269 277
270 if (res & 0x80) 278 if (res & 0x80)
271 { 279 {
272 int cnt = res & 0x7f; 280 int cnt = res & 0x7f;
273 res = 0; 281 res = 0;
274 282
275 switch (cnt) 283 switch (cnt)
276 { 284 {
277 case 0: 285 case 0:
278 error ("indefinite ASN.1 lengths not supported"); 286 error ("indefinite ASN.1 lengths not supported");
279 return 0; 287
288 case 0x7f:
289 error ("ASN.1 reserved value in length (X.690 8.1.3.5)");
280 290
281 default: 291 default:
282 error ("ASN.1 length too long"); 292 error ("ASN.1 length too long (only up to 2**64 octets supported)");
283 return 0;
284 293
294 case 8: res = (res << 8) | get_u8 ();
295 case 7: res = (res << 8) | get_u8 ();
296 case 6: res = (res << 8) | get_u8 ();
297 case 5: res = (res << 8) | get_u8 ();
285 case 4: res = (res << 8) | get_u8 (); 298 case 4: res = (res << 8) | get_u8 ();
286 case 3: res = (res << 8) | get_u8 (); 299 case 3: res = (res << 8) | get_u8 ();
287 case 2: res = (res << 8) | get_u8 (); 300 case 2: res = (res << 8) | get_u8 ();
288 case 1: res = (res << 8) | get_u8 (); 301 case 1: res = (res << 8) | get_u8 ();
289 } 302 }
291 304
292 return res; 305 return res;
293} 306}
294 307
295static SV * 308static SV *
296decode_int () 309decode_int (void)
297{ 310{
298 int len = get_length (); 311 UV len = get_length ();
299 312
300 if (len <= 0) 313 if (!len)
301 {
302 error ("integer length equal to zero"); 314 error ("invalid integer length equal to zero (X.690 8.3.1)");
303 return 0;
304 }
305 315
306 U8 *data = get_n (len); 316 U8 *data = get_n (len);
317
318 if (expect_false (len > 1))
319 {
320 U16 mask = (data [0] << 8) | data [1] & 0xff80;
321
322 if (expect_false (mask == 0xff80 || mask == 0x0000))
323 error ("illegal padding in integer (X.690 8.3.2)");
324 }
307 325
308 int negative = data [0] & 0x80; 326 int negative = data [0] & 0x80;
309 327
310 UV val = negative ? -1 : 0; // copy signbit to all bits 328 UV val = negative ? -1 : 0; // copy signbit to all bits
311 329
319} 337}
320 338
321static SV * 339static SV *
322decode_data (void) 340decode_data (void)
323{ 341{
324 U32 len = get_length (); 342 UV len = get_length ();
325 U8 *data = get_n (len);
326 return newSVpvn ((char *)data, len); 343 return newSVpvn ((char *)get_n (len), len);
327} 344}
328 345
329// gelper for decode_object_identifier 346// helper for decode_object_identifier
330static char * 347static char *
331write_uv (char *buf, U32 u) 348write_uv (char *buf, UV u)
332{ 349{
333 // the one-digit case is absolutely predominant, so this pays off (hopefully) 350 // the one-digit case is absolutely predominant, so this pays off (hopefully)
334 if (expect_true (u < 10)) 351 if (expect_true (u < 10))
335 *buf++ = u + '0'; 352 *buf++ = u + '0';
336 else 353 else
337 { 354 {
355 // this *could* be done much faster using branchless fixed-point arithmetics
338 char *beg = buf; 356 char *beg = buf;
339 357
340 do 358 do
341 { 359 {
342 *buf++ = u % 10 + '0'; 360 *buf++ = u % 10 + '0';
344 } 362 }
345 while (u); 363 while (u);
346 364
347 // reverse digits 365 // reverse digits
348 char *ptr = buf; 366 char *ptr = buf;
349 while (--ptr != beg) 367 while (--ptr > beg)
350 { 368 {
351 char c = *ptr; 369 char c = *ptr;
352 *ptr = *beg; 370 *ptr = *beg;
353 *beg = c; 371 *beg = c;
354 ++beg; 372 ++beg;
359} 377}
360 378
361static SV * 379static SV *
362decode_oid (int relative) 380decode_oid (int relative)
363{ 381{
364 U32 len = get_length (); 382 UV len = get_length ();
365 383
366 if (len <= 0) 384 if (len <= 0)
367 { 385 {
368 error ("OBJECT IDENTIFIER length equal to zero"); 386 error ("OBJECT IDENTIFIER length equal to zero");
369 return &PL_sv_undef; 387 return &PL_sv_undef;
370 } 388 }
371 389
372 U8 *end = cur + len; 390 U8 *end = cur + len;
373 U32 w = get_w (); 391 UV w = get_w ();
374 392
375 static char oid[MAX_OID_STRLEN]; // must be static 393 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack
376 char *app = oid; 394 char *app = oid;
377 395
378 if (relative) 396 if (relative)
379 app = write_uv (app, w); 397 app = write_uv (app, w);
380 else 398 else if (w < 2 * 40)
381 { 399 {
382 app = write_uv (app, (U8)w / 40); 400 app = write_uv (app, (U8)w / 40);
383 *app++ = '.'; 401 *app++ = '.';
384 app = write_uv (app, (U8)w % 40); 402 app = write_uv (app, (U8)w % 40);
385 } 403 }
404 else
405 {
406 app = write_uv (app, 2);
407 *app++ = '.';
408 app = write_uv (app, w - 2 * 40);
409 }
386 410
411 while (cur < end)
412 {
387 // we assume an oid component is never > 64 bytes 413 // we assume an oid component is never > 64 digits
388 while (cur < end && oid + sizeof (oid) - app > 64) 414 if (oid + sizeof (oid) - app < 64)
389 { 415 croak ("BER_TYPE_OID to long to decode");
416
390 w = get_w (); 417 w = get_w ();
391 *app++ = '.'; 418 *app++ = '.';
392 app = write_uv (app, w); 419 app = write_uv (app, w);
393 } 420 }
394 421
399static SV * 426static SV *
400decode_ucs (int chrsize) 427decode_ucs (int chrsize)
401{ 428{
402 SV *res = NEWSV (0, 0); 429 SV *res = NEWSV (0, 0);
403 430
404 U32 len = get_length (); 431 UV len = get_length ();
405 432
406 if (len & (chrsize - 1)) 433 if (len & (chrsize - 1))
407 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len); 434 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
408 435
409 while (len) 436 while (len)
430 457
431 return res; 458 return res;
432} 459}
433 460
434static SV * 461static SV *
435decode_ber () 462decode_ber (void)
436{ 463{
437 int identifier = get_u8 (); 464 int identifier = get_u8 ();
438 465
439 SV *res; 466 SV *res;
440 467
443 int tag = identifier & ASN_TAG_MASK; 470 int tag = identifier & ASN_TAG_MASK;
444 471
445 if (tag == ASN_TAG_BER) 472 if (tag == ASN_TAG_BER)
446 tag = get_w (); 473 tag = get_w ();
447 474
448 if (tag == ASN_TAG_BER)
449 tag = get_w ();
450
451 if (constructed) 475 if (constructed)
452 { 476 {
453 U32 len = get_length (); 477 UV len = get_length ();
454 U32 seqend = (cur - buf) + len; 478 UV seqend = (cur - buf) + len;
455 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 479 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
456 480
457 while (cur < buf + seqend) 481 while (cur < buf + seqend)
458 av_push (av, decode_ber ()); 482 av_push (av, decode_ber ());
459 483
460 if (cur > buf + seqend) 484 if (cur > buf + seqend)
461 croak ("constructed type %02x overflow (%x %x)\n", identifier, cur - buf, seqend); 485 croak ("constructed type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
462 486
463 res = newRV_inc ((SV *)av); 487 res = newRV_inc ((SV *)av);
464 } 488 }
465 else 489 else
466 switch (profile_lookup (cur_profile, klass, tag)) 490 switch (profile_lookup (cur_profile, klass, tag))
467 { 491 {
468 case BER_TYPE_NULL: 492 case BER_TYPE_NULL:
493 {
494 UV len = get_length ();
495
496 if (len)
497 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
498
469 res = &PL_sv_undef; 499 res = &PL_sv_undef;
500 }
470 break; 501 break;
471 502
472 case BER_TYPE_BOOL: 503 case BER_TYPE_BOOL:
473 { 504 {
474 U32 len = get_length (); 505 UV len = get_length ();
475 506
476 if (len != 1) 507 if (len != 1)
477 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len); 508 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
478 509
479 res = newSVcacheint (get_u8 () ? 0 : 1); 510 res = newSVcacheint (!!get_u8 ());
480 } 511 }
481 break; 512 break;
482 513
483 case BER_TYPE_OID: 514 case BER_TYPE_OID:
484 res = decode_oid (0); 515 res = decode_oid (0);
501 res = decode_data (); 532 res = decode_data ();
502 break; 533 break;
503 534
504 case BER_TYPE_IPADDRESS: 535 case BER_TYPE_IPADDRESS:
505 { 536 {
506 U32 len = get_length (); 537 UV len = get_length ();
507 538
508 if (len != 4) 539 if (len != 4)
509 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 540 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
510 541
511 U8 c1 = get_u8 (); 542 U8 c1 = get_u8 ();
512 U8 c2 = get_u8 (); 543 U8 c2 = get_u8 ();
513 U8 c3 = get_u8 (); 544 U8 c3 = get_u8 ();
514 U8 c4 = get_u8 (); 545 U8 c4 = get_u8 ();
531 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 562 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
532 } 563 }
533 564
534 AV *av = newAV (); 565 AV *av = newAV ();
535 av_fill (av, BER_ARRAYSIZE - 1); 566 av_fill (av, BER_ARRAYSIZE - 1);
536 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 567 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
537 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 568 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
538 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 569 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
539 AvARRAY (av)[BER_DATA ] = res; 570 AvARRAY (av)[BER_DATA ] = res;
540 571
541 return newRV_noinc ((SV *)av); 572 return newRV_noinc ((SV *)av);
542} 573}
543 574
544///////////////////////////////////////////////////////////////////////////// 575/////////////////////////////////////////////////////////////////////////////
549strlen_sum (STRLEN l1, STRLEN l2) 580strlen_sum (STRLEN l1, STRLEN l2)
550{ 581{
551 size_t sum = l1 + l2; 582 size_t sum = l1 + l2;
552 583
553 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 584 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
554 croak ("JSON::XS: string size overflow"); 585 croak ("Convert::BER::XS: string size overflow");
555 586
556 return sum; 587 return sum;
557} 588}
558 589
559static void 590static void
597 need (1); 628 need (1);
598 *cur++ = val; 629 *cur++ = val;
599} 630}
600 631
601static void 632static void
602put_w_nocheck (U32 val) 633put_w_nocheck (UV val)
603{ 634{
635#if UVSIZE > 4
636 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
637 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
638 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
639 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
640 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
641#endif
604 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 642 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
605 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 643 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
606 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 644 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
607 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 645 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
608 *cur = val & 0x7f; cur += 1; 646 *cur = val & 0x7f; cur += 1;
609} 647}
610 648
611static void 649static void
612put_w (U32 val) 650put_w (UV val)
613{ 651{
614 need (5); // we only handle up to 5 bytes 652 need (5); // we only handle up to 5 bytes
615 653
616 put_w_nocheck (val); 654 put_w_nocheck (val);
617} 655}
618 656
619static U8 * 657static U8 *
620put_length_at (U32 val, U8 *cur) 658put_length_at (UV val, U8 *cur)
621{ 659{
622 if (val < 0x7fU) 660 if (val < 0x7fU)
623 *cur++ = val; 661 *cur++ = val;
624 else 662 else
625 { 663 {
626 U8 *lenb = cur++; 664 U8 *lenb = cur++;
627 665
666#if UVSIZE > 4
667 *cur = val >> 56; cur += *cur > 0;
668 *cur = val >> 48; cur += *cur > 0;
669 *cur = val >> 40; cur += *cur > 0;
670 *cur = val >> 32; cur += *cur > 0;
671#endif
628 *cur = val >> 24; cur += *cur > 0; 672 *cur = val >> 24; cur += *cur > 0;
629 *cur = val >> 16; cur += *cur > 0; 673 *cur = val >> 16; cur += *cur > 0;
630 *cur = val >> 8; cur += *cur > 0; 674 *cur = val >> 8; cur += *cur > 0;
631 *cur = val ; cur += 1; 675 *cur = val ; cur += 1;
632 676
635 679
636 return cur; 680 return cur;
637} 681}
638 682
639static void 683static void
640put_length (U32 val) 684put_length (UV val)
641{ 685{
642 need (5 + val); 686 need (5 + val);
643 cur = put_length_at (val, cur); 687 cur = put_length_at (val, cur);
644} 688}
645 689
646// return how many bytes the encoded length requires 690// return how many bytes the encoded length requires
647static int length_length (U32 val) 691static int length_length (UV val)
648{ 692{
649 return val < 0x7fU 693 return val < 0x7fU
650 ? 1 694 ? 1
651 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 695 : 2
696 + (val > 0xffU)
697 + (val > 0xffffU)
698 + (val > 0xffffffU)
699#if UVSIZE > 4
700 + (val > 0xffffffffU)
701 + (val > 0xffffffffffU)
702 + (val > 0xffffffffffffU)
703 + (val > 0xffffffffffffffU)
704#endif
705 ;
652} 706}
653 707
654static void 708static void
655encode_data (const char *ptr, STRLEN len) 709encode_data (const char *ptr, STRLEN len)
656{ 710{
718 772
719 *lenb = cur - lenb - 1; 773 *lenb = cur - lenb - 1;
720} 774}
721 775
722// we don't know the length yet, so we optimistically 776// we don't know the length yet, so we optimistically
723// assume the length will need one octet later. if that 777// assume the length will need one octet later. If that
724// turns out to be wrong, we memove as needed. 778// turns out to be wrong, we memmove as needed.
725// mark the beginning 779// mark the beginning
726static STRLEN 780static STRLEN
727len_fixup_mark () 781len_fixup_mark (void)
728{ 782{
729 return cur++ - buf; 783 return cur++ - buf;
730} 784}
731 785
732// patch up the length 786// patch up the length
841{ 895{
842 AV *av = ber_tuple (tuple); 896 AV *av = ber_tuple (tuple);
843 897
844 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 898 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
845 int tag = SvIV (AvARRAY (av)[BER_TAG]); 899 int tag = SvIV (AvARRAY (av)[BER_TAG]);
846 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 900 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
847 SV *data = AvARRAY (av)[BER_DATA]; 901 SV *data = AvARRAY (av)[BER_DATA];
848 902
849 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 903 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
850 904
851 if (expect_false (tag >= ASN_TAG_BER)) 905 if (expect_false (tag >= ASN_TAG_BER))
885 put_length (0); 939 put_length (0);
886 break; 940 break;
887 941
888 case BER_TYPE_BOOL: 942 case BER_TYPE_BOOL:
889 put_length (1); 943 put_length (1);
890 *cur++ = SvTRUE (data) ? 0xff : 0x00; 944 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
891 break; 945 break;
892 946
893 case BER_TYPE_OID: 947 case BER_TYPE_OID:
894 encode_oid (data, 0); 948 encode_oid (data, 0);
895 break; 949 break;
958 const char *name; 1012 const char *name;
959 IV iv; 1013 IV iv;
960 } *civ, const_iv[] = { 1014 } *civ, const_iv[] = {
961#define const_iv(name) { # name, name }, 1015#define const_iv(name) { # name, name },
962 const_iv (ASN_BOOLEAN) 1016 const_iv (ASN_BOOLEAN)
963 const_iv (ASN_INTEGER32) 1017 const_iv (ASN_INTEGER)
964 const_iv (ASN_BIT_STRING) 1018 const_iv (ASN_BIT_STRING)
965 const_iv (ASN_OCTET_STRING) 1019 const_iv (ASN_OCTET_STRING)
966 const_iv (ASN_NULL) 1020 const_iv (ASN_NULL)
967 const_iv (ASN_OBJECT_IDENTIFIER) 1021 const_iv (ASN_OBJECT_IDENTIFIER)
968 const_iv (ASN_OBJECT_DESCRIPTOR) 1022 const_iv (ASN_OBJECT_DESCRIPTOR)
997 const_iv (ASN_CONTEXT) 1051 const_iv (ASN_CONTEXT)
998 const_iv (ASN_PRIVATE) 1052 const_iv (ASN_PRIVATE)
999 1053
1000 const_iv (BER_CLASS) 1054 const_iv (BER_CLASS)
1001 const_iv (BER_TAG) 1055 const_iv (BER_TAG)
1002 const_iv (BER_CONSTRUCTED) 1056 const_iv (BER_FLAGS)
1003 const_iv (BER_DATA) 1057 const_iv (BER_DATA)
1004 1058
1005 const_iv (BER_TYPE_BYTES) 1059 const_iv (BER_TYPE_BYTES)
1006 const_iv (BER_TYPE_UTF8) 1060 const_iv (BER_TYPE_UTF8)
1007 const_iv (BER_TYPE_UCS2) 1061 const_iv (BER_TYPE_UCS2)
1040 RETVAL = decode_ber (); 1094 RETVAL = decode_ber ();
1041} 1095}
1042 OUTPUT: RETVAL 1096 OUTPUT: RETVAL
1043 1097
1044void 1098void
1045ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &PL_sv_undef, SV *data = &PL_sv_undef) 1099ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *flags = &PL_sv_undef, SV *data = &PL_sv_undef)
1046 PPCODE: 1100 PPCODE:
1047{ 1101{
1048 if (!SvOK (tuple)) 1102 if (!SvOK (tuple))
1049 XSRETURN_NO; 1103 XSRETURN_NO;
1050 1104
1052 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1106 croak ("ber_is: tuple must be BER tuple (array-ref)");
1053 1107
1054 AV *av = (AV *)SvRV (tuple); 1108 AV *av = (AV *)SvRV (tuple);
1055 1109
1056 XPUSHs ( 1110 XPUSHs (
1057 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1111 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1058 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1112 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1059 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1113 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1060 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1114 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1061 ? &PL_sv_yes : &PL_sv_undef); 1115 ? &PL_sv_yes : &PL_sv_undef);
1062} 1116}
1063 1117
1064void 1118void
1065ber_is_seq (SV *tuple) 1119ber_is_seq (SV *tuple)
1069 XSRETURN_UNDEF; 1123 XSRETURN_UNDEF;
1070 1124
1071 AV *av = ber_tuple (tuple); 1125 AV *av = ber_tuple (tuple);
1072 1126
1073 XPUSHs ( 1127 XPUSHs (
1074 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1128 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1075 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1129 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1076 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1130 && SvIV (AvARRAY (av)[BER_FLAGS])
1077 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1131 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1078} 1132}
1079 1133
1080void 1134void
1081ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1135ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1082 PPCODE: 1136 PPCODE:
1083{ 1137{
1084 if (!SvOK (tuple)) 1138 if (!SvOK (tuple))
1085 XSRETURN_NO; 1139 XSRETURN_NO;
1086 1140
1087 AV *av = ber_tuple (tuple); 1141 AV *av = ber_tuple (tuple);
1088 1142
1089 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1143 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1090 1144
1091 XPUSHs ( 1145 XPUSHs (
1092 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1146 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1093 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1147 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1094 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1148 && !SvIV (AvARRAY (av)[BER_FLAGS])
1095 && (!SvOK (value) || data == SvIV (value)) 1149 && (!SvOK (value) || data == SvUV (value))
1096 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1150 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1097 : &PL_sv_undef); 1151 : &PL_sv_undef);
1098} 1152}
1099 1153
1100void 1154void
1101ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1155ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
1105 XSRETURN_NO; 1159 XSRETURN_NO;
1106 1160
1107 AV *av = ber_tuple (tuple); 1161 AV *av = ber_tuple (tuple);
1108 1162
1109 XPUSHs ( 1163 XPUSHs (
1110 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1164 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1111 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1165 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1112 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1166 && !SvIV (AvARRAY (av)[BER_FLAGS])
1113 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1167 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1114 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1168 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1115} 1169}
1116 1170
1117############################################################################# 1171#############################################################################
1130 SvCUR_set (buf_sv, cur - buf); 1184 SvCUR_set (buf_sv, cur - buf);
1131 XPUSHs (buf_sv); 1185 XPUSHs (buf_sv);
1132} 1186}
1133 1187
1134SV * 1188SV *
1135ber_i32 (IV iv) 1189ber_int (SV *sv)
1136 CODE: 1190 CODE:
1137{ 1191{
1138 AV *av = newAV (); 1192 AV *av = newAV ();
1139 av_fill (av, BER_ARRAYSIZE - 1); 1193 av_fill (av, BER_ARRAYSIZE - 1);
1140 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1194 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1141 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1195 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1142 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1196 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1143 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1197 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1144 RETVAL = newRV_noinc ((SV *)av); 1198 RETVAL = newRV_noinc ((SV *)av);
1145} 1199}
1146 OUTPUT: RETVAL 1200 OUTPUT: RETVAL
1147 1201
1148# TODO: not arrayref, but elements? 1202# TODO: not arrayref, but elements?
1150ber_seq (SV *arrayref) 1204ber_seq (SV *arrayref)
1151 CODE: 1205 CODE:
1152{ 1206{
1153 AV *av = newAV (); 1207 AV *av = newAV ();
1154 av_fill (av, BER_ARRAYSIZE - 1); 1208 av_fill (av, BER_ARRAYSIZE - 1);
1155 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1209 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1156 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1210 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1157 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1211 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1158 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1212 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1159 RETVAL = newRV_noinc ((SV *)av); 1213 RETVAL = newRV_noinc ((SV *)av);
1160} 1214}
1161 OUTPUT: RETVAL 1215 OUTPUT: RETVAL
1162 1216
1163MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1217MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines