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.33 by root, Thu Apr 25 22:30:21 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#include <math.h>
6
5// C99 required 7// C99 required!
8// this is not just for comments, but also for
9// integer constant semantics,
10// sscanf format modifiers and more.
6 11
7enum { 12enum {
8 // ASN_TAG 13 // ASN_TAG
9 ASN_BOOLEAN = 0x01, 14 ASN_BOOLEAN = 0x01,
10 ASN_INTEGER32 = 0x02, 15 ASN_INTEGER = 0x02,
11 ASN_BIT_STRING = 0x03, 16 ASN_BIT_STRING = 0x03,
12 ASN_OCTET_STRING = 0x04, 17 ASN_OCTET_STRING = 0x04,
13 ASN_NULL = 0x05, 18 ASN_NULL = 0x05,
14 ASN_OBJECT_IDENTIFIER = 0x06, 19 ASN_OBJECT_IDENTIFIER = 0x06,
15 ASN_OID = 0x06, 20 ASN_OID = 0x06,
55 ASN_CLASS_SHIFT = 6, 60 ASN_CLASS_SHIFT = 6,
56 61
57 // ASN_APPLICATION SNMP 62 // ASN_APPLICATION SNMP
58 SNMP_IPADDRESS = 0x00, 63 SNMP_IPADDRESS = 0x00,
59 SNMP_COUNTER32 = 0x01, 64 SNMP_COUNTER32 = 0x01,
65 SNMP_GAUGE32 = 0x02,
60 SNMP_UNSIGNED32 = 0x02, 66 SNMP_UNSIGNED32 = 0x02,
61 SNMP_TIMETICKS = 0x03, 67 SNMP_TIMETICKS = 0x03,
62 SNMP_OPAQUE = 0x04, 68 SNMP_OPAQUE = 0x04,
63 SNMP_COUNTER64 = 0x06, 69 SNMP_COUNTER64 = 0x06,
64}; 70};
65 71
72// tlow-level types this module can ecode the above (and more) into
66enum { 73enum {
67 BER_TYPE_BYTES, 74 BER_TYPE_BYTES,
68 BER_TYPE_UTF8, 75 BER_TYPE_UTF8,
69 BER_TYPE_UCS2, 76 BER_TYPE_UCS2,
70 BER_TYPE_UCS4, 77 BER_TYPE_UCS4,
76 BER_TYPE_REAL, 83 BER_TYPE_REAL,
77 BER_TYPE_IPADDRESS, 84 BER_TYPE_IPADDRESS,
78 BER_TYPE_CROAK, 85 BER_TYPE_CROAK,
79}; 86};
80 87
88// tuple array indices
81enum { 89enum {
82 BER_CLASS = 0, 90 BER_CLASS = 0,
83 BER_TAG = 1, 91 BER_TAG = 1,
84 BER_CONSTRUCTED = 2, 92 BER_FLAGS = 2,
85 BER_DATA = 3, 93 BER_DATA = 3,
86 BER_ARRAYSIZE 94 BER_ARRAYSIZE
87}; 95};
88 96
89#define MAX_OID_STRLEN 4096 97#define MAX_OID_STRLEN 4096
90 98
94static SV *buf_sv; // encoding buffer 102static SV *buf_sv; // encoding buffer
95static U8 *buf, *cur, *end; // buffer start, current, end 103static U8 *buf, *cur, *end; // buffer start, current, end
96 104
97#if PERL_VERSION < 18 105#if PERL_VERSION < 18
98# define utf8_to_uvchr_buf(s,e,l) utf8_to_uvchr (s, l) 106# define utf8_to_uvchr_buf(s,e,l) utf8_to_uvchr (s, l)
107#endif
108
109#ifndef SvREFCNT_inc_NN
110#define SvREFCNT_inc_NN(x) SvREFCNT_inc (x)
111#endif
112#ifndef SvREFCNT_dec_NN
113#define SvREFCNT_dec_NN(x) SvREFCNT_dec (x)
99#endif 114#endif
100 115
101#if __GNUC__ >= 3 116#if __GNUC__ >= 3
102# define expect(expr,value) __builtin_expect ((expr), (value)) 117# define expect(expr,value) __builtin_expect ((expr), (value))
103# define INLINE static inline 118# define INLINE static inline
137{ 152{
138 if (!SvOK (profile)) 153 if (!SvOK (profile))
139 return default_profile; 154 return default_profile;
140 155
141 if (!SvROK (profile)) 156 if (!SvROK (profile))
142 croak ("invalid profile"); 157 croak ("Convert::BER::XS::Profile expected");
143 158
144 profile = SvRV (profile); 159 profile = SvRV (profile);
145 160
146 if (SvSTASH (profile) != profile_stash) 161 if (SvSTASH (profile) != profile_stash)
147 croak ("invalid profile object"); 162 croak ("Convert::BER::XS::Profile expected");
148 163
149 return (void *)profile; 164 return (void *)profile;
150} 165}
151 166
152static int 167static int
178 193
179 SvPVX (sv)[idx] = type; 194 SvPVX (sv)[idx] = type;
180} 195}
181 196
182static SV * 197static SV *
183profile_new () 198profile_new (void)
184{ 199{
185 SV *sv = newSVpvn ("", 0); 200 SV *sv = newSVpvn ("", 0);
186 201
187 static const struct { 202 static const struct {
188 int klass; 203 int klass;
189 int tag; 204 int tag;
190 int type; 205 int type;
191 } *celem, default_map[] = { 206 } *celem, default_map[] = {
192 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL }, 207 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },
193 { ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT }, 208 { ASN_UNIVERSAL, ASN_INTEGER , BER_TYPE_INT },
194 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL }, 209 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },
195 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID }, 210 { 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 }, 211 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
198 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL }, 212 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
213 { ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
199 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 }, 214 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },
200 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 }, 215 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },
201 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 }, 216 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },
202 }; 217 };
203 218
224} 239}
225 240
226// get_* functions fetch something from the buffer 241// get_* functions fetch something from the buffer
227// decode_* functions use get_* fun ctions to decode ber values 242// decode_* functions use get_* fun ctions to decode ber values
228 243
244// get single octet
245static U8
246get_u8 (void)
247{
248 if (cur == end)
249 error ("unexpected end of message buffer");
250
251 return *cur++;
252}
253
229// get n octets 254// get n octets
230static U8 * 255static U8 *
231get_n (UV count) 256get_n (UV count)
232{ 257{
233 want (count); 258 want (count);
234 U8 *res = cur; 259 U8 *res = cur;
235 cur += count; 260 cur += count;
236 return res; 261 return res;
237} 262}
238 263
239// get single octet
240static U8
241get_u8 (void)
242{
243 if (cur == end)
244 error ("unexpected end of message buffer");
245
246 return *cur++;
247}
248
249// get ber-encoded integer (i.e. pack "w") 264// get ber-encoded integer (i.e. pack "w")
250static U32 265static UV
251get_w (void) 266get_w (void)
252{ 267{
253 U32 res = 0; 268 UV res = 0;
269 U8 c = get_u8 ();
270
271 if (expect_false (c == 0x80))
272 error ("invalid BER padding (X.690 8.1.2.4.2, 8.19.2)");
254 273
255 for (;;) 274 for (;;)
256 { 275 {
257 U8 c = get_u8 (); 276 if (expect_false (res >> UVSIZE * 8 - 7))
277 error ("BER variable length integer overflow");
278
258 res = (res << 7) | (c & 0x7f); 279 res = (res << 7) | (c & 0x7f);
259 280
260 if (!(c & 0x80)) 281 if (expect_true (!(c & 0x80)))
261 return res; 282 return res;
262 }
263}
264 283
284 c = get_u8 ();
285 }
286}
287
265static U32 288static UV
266get_length (void) 289get_length (void)
267{ 290{
268 U32 res = get_u8 (); 291 UV res = get_u8 ();
269 292
270 if (res & 0x80) 293 if (expect_false (res & 0x80))
271 { 294 {
272 int cnt = res & 0x7f; 295 U8 cnt = res & 0x7f;
296
297 // this genewrates quite ugly code, but the overhead
298 // of copying the bytes for these lengths is probably so high
299 // that a slightly inefficient get_length won't matter.
300
301 if (expect_false (cnt == 0))
302 error ("invalid use of indefinite BER length form in primitive encoding (X.690 8.1.3.2)");
303
304 if (expect_false (cnt > UVSIZE))
305 error ("BER value length too long (must fit into UV) or BER reserved value in length (X.690 8.1.3.5)");
306
307 want (cnt);
308
273 res = 0; 309 res = 0;
274 310 do
275 switch (cnt) 311 res = (res << 8) | *cur++;
276 { 312 while (--cnt);
277 case 0:
278 error ("indefinite ASN.1 lengths not supported");
279 return 0;
280
281 default:
282 error ("ASN.1 length too long");
283 return 0;
284
285 case 4: res = (res << 8) | get_u8 ();
286 case 3: res = (res << 8) | get_u8 ();
287 case 2: res = (res << 8) | get_u8 ();
288 case 1: res = (res << 8) | get_u8 ();
289 }
290 } 313 }
291 314
292 return res; 315 return res;
293} 316}
294 317
295static SV * 318static SV *
296decode_int () 319decode_int (UV len)
297{ 320{
298 int len = get_length ();
299
300 if (len <= 0) 321 if (!len)
301 { 322 error ("invalid BER_TYPE_INT length zero (X.690 8.3.1)");
302 error ("integer length equal to zero");
303 return 0;
304 }
305 323
306 U8 *data = get_n (len); 324 U8 *data = get_n (len);
307 325
326 if (expect_false (len > 1))
327 {
328 U16 mask = (data [0] << 8) | data [1] & 0xff80;
329
330 if (expect_false (mask == 0xff80 || mask == 0x0000))
331 error ("invalid padding in BER_TYPE_INT (X.690 8.3.2)");
332 }
333
308 int negative = data [0] & 0x80; 334 int negative = data [0] & 0x80;
309 335
310 UV val = negative ? -1 : 0; // copy signbit to all bits 336 UV val = negative ? -1 : 0; // copy signbit to all bits
337
338 if (len > UVSIZE + (!negative && !*data))
339 error ("BER_TYPE_INT overflow");
311 340
312 do 341 do
313 val = (val << 8) | *data++; 342 val = (val << 8) | *data++;
314 while (--len); 343 while (--len);
315 344
317 // but that's ok, as perl relies on it as well. 346 // but that's ok, as perl relies on it as well.
318 return negative ? newSViv ((IV)val) : newSVuv (val); 347 return negative ? newSViv ((IV)val) : newSVuv (val);
319} 348}
320 349
321static SV * 350static SV *
322decode_data (void) 351decode_data (UV len)
323{ 352{
324 U32 len = get_length ();
325 U8 *data = get_n (len);
326 return newSVpvn ((char *)data, len); 353 return newSVpvn ((char *)get_n (len), len);
327} 354}
328 355
329// gelper for decode_object_identifier 356// helper for decode_object_identifier
330static char * 357static char *
331write_uv (char *buf, U32 u) 358write_uv (char *buf, UV u)
332{ 359{
333 // the one-digit case is absolutely predominant, so this pays off (hopefully) 360 // the one-digit case is absolutely predominant, so this pays off (hopefully)
334 if (expect_true (u < 10)) 361 if (expect_true (u < 10))
335 *buf++ = u + '0'; 362 *buf++ = u + '0';
336 else 363 else
337 { 364 {
365 // this *could* be done much faster using branchless fixed-point arithmetics
338 char *beg = buf; 366 char *beg = buf;
339 367
340 do 368 do
341 { 369 {
342 *buf++ = u % 10 + '0'; 370 *buf++ = u % 10 + '0';
344 } 372 }
345 while (u); 373 while (u);
346 374
347 // reverse digits 375 // reverse digits
348 char *ptr = buf; 376 char *ptr = buf;
349 while (--ptr != beg) 377 while (--ptr > beg)
350 { 378 {
351 char c = *ptr; 379 char c = *ptr;
352 *ptr = *beg; 380 *ptr = *beg;
353 *beg = c; 381 *beg = c;
354 ++beg; 382 ++beg;
357 385
358 return buf; 386 return buf;
359} 387}
360 388
361static SV * 389static SV *
362decode_oid (int relative) 390decode_oid (UV len, int relative)
363{ 391{
364 U32 len = get_length ();
365
366 if (len <= 0) 392 if (len <= 0)
367 { 393 {
368 error ("OBJECT IDENTIFIER length equal to zero"); 394 error ("BER_TYPE_OID length must not be zero");
369 return &PL_sv_undef; 395 return &PL_sv_undef;
370 } 396 }
371 397
372 U8 *end = cur + len; 398 U8 *end = cur + len;
373 U32 w = get_w (); 399 UV w = get_w ();
374 400
375 static char oid[MAX_OID_STRLEN]; // must be static 401 static char oid[MAX_OID_STRLEN]; // static, because too large for stack
376 char *app = oid; 402 char *app = oid;
377 403
378 if (relative) 404 if (relative)
379 app = write_uv (app, w); 405 app = write_uv (app, w);
380 else 406 else
381 { 407 {
408 UV w1, w2;
409
410 if (w < 2 * 40)
411 (w1 = w / 40), (w2 = w % 40);
412 else
413 (w1 = 2), (w2 = w - 2 * 40);
414
382 app = write_uv (app, (U8)w / 40); 415 app = write_uv (app, w1);
383 *app++ = '.'; 416 *app++ = '.';
384 app = write_uv (app, (U8)w % 40); 417 app = write_uv (app, w2);
418 }
419
420 while (cur < end)
385 } 421 {
386
387 // we assume an oid component is never > 64 bytes 422 // we assume an oid component is never > 64 digits
388 while (cur < end && oid + sizeof (oid) - app > 64) 423 if (oid + sizeof (oid) - app < 64)
389 { 424 croak ("BER_TYPE_OID to long to decode");
425
390 w = get_w (); 426 w = get_w ();
391 *app++ = '.'; 427 *app++ = '.';
392 app = write_uv (app, w); 428 app = write_uv (app, w);
393 } 429 }
394 430
395 return newSVpvn (oid, app - oid); 431 return newSVpvn (oid, app - oid);
396} 432}
397 433
434// oh my, this is a total mess
435static SV *
436decode_real (UV len)
437{
438 SV *res;
439 U8 *beg = cur;
440
441 if (len == 0)
442 res = newSVnv (0.);
443 else
444 {
445 U8 info = get_u8 ();
446
447 if (info & 0x80)
448 {
449 // binary
450 static const U8 base[] = { 2, 8, 16, 0 };
451 NV S = info & 0x40 ? -1 : 1; // sign
452 NV B = base [(info >> 4) & 3]; // base
453 NV F = 1 << ((info >> 2) & 3); // scale factor ("shift")
454 int L = info & 3; // exponent length
455
456 if (!B)
457 croak ("BER_TYPE_REAL binary encoding uses invalid base (0x%02x)", info);
458
459 SAVETMPS;
460
461 SV *E = sv_2mortal (decode_int (L == 3 ? get_u8 () : L + 1));
462 SV *M = sv_2mortal (decode_int (len - (cur - beg)));
463
464 res = newSVnv (S * SvNV (M) * F * Perl_pow (B, SvNV (E)));
465
466 FREETMPS;
467 }
468 else if (info & 0x40)
469 {
470 // SpecialRealValue
471 U8 special = get_u8 ();
472 NV val;
473
474 switch (special)
475 {
476 case 0x40: val = NV_INF; break;
477 case 0x41: val = -NV_INF; break;
478 case 0x42: val = NV_NAN; break;
479 case 0x43: val = -(NV)0.; break;
480
481 default:
482 croak ("BER_TYPE_REAL SpecialRealValues invalid encoding 0x%02x (X.690 8.5.9)", special);
483 }
484
485 res = newSVnv (val);
486 }
487 else
488 {
489 // decimal
490 dSP;
491 SAVETMPS;
492 PUSHMARK (SP);
493 EXTEND (SP, 2);
494 PUSHs (sv_2mortal (newSVcacheint (info & 0x3f)));
495 PUSHs (sv_2mortal (newSVpvn (get_n (len - 1), len - 1)));
496 PUTBACK;
497 call_pv ("Convert::BER::XS::_decode_real_decimal", G_SCALAR);
498 SPAGAIN;
499 res = SvREFCNT_inc_NN (POPs);
500 PUTBACK;
501 FREETMPS;
502 }
503 }
504
505 if (cur - beg != len)
506 {
507 SvREFCNT_dec_NN (res);
508 croak ("BER_TYPE_REAL invalid content length (X.690 8,5)");
509 }
510
511 return res;
512}
513
398// TODO: this is unacceptably slow 514// TODO: this is unacceptably slow
399static SV * 515static SV *
400decode_ucs (int chrsize) 516decode_ucs (UV len, int chrsize)
401{ 517{
402 SV *res = NEWSV (0, 0);
403
404 U32 len = get_length ();
405
406 if (len & (chrsize - 1)) 518 if (len & (chrsize - 1))
407 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len); 519 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
520
521 SV *res = NEWSV (0, 0);
408 522
409 while (len) 523 while (len)
410 { 524 {
411 U8 b1 = get_u8 (); 525 U8 b1 = get_u8 ();
412 U8 b2 = get_u8 (); 526 U8 b2 = get_u8 ();
430 544
431 return res; 545 return res;
432} 546}
433 547
434static SV * 548static SV *
435decode_ber () 549decode_ber (void)
436{ 550{
437 int identifier = get_u8 (); 551 int identifier = get_u8 ();
438 552
439 SV *res; 553 SV *res;
440 554
443 int tag = identifier & ASN_TAG_MASK; 557 int tag = identifier & ASN_TAG_MASK;
444 558
445 if (tag == ASN_TAG_BER) 559 if (tag == ASN_TAG_BER)
446 tag = get_w (); 560 tag = get_w ();
447 561
448 if (tag == ASN_TAG_BER)
449 tag = get_w ();
450
451 if (constructed) 562 if (constructed)
452 { 563 {
453 U32 len = get_length (); 564 want (1);
454 U32 seqend = (cur - buf) + len;
455 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 565 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
456 566
457 while (cur < buf + seqend) 567 if (expect_false (*cur == 0x80))
568 {
569 // indefinite length
570 ++cur;
571
572 for (;;)
573 {
574 want (2);
575 if (!cur [0] && !cur [1])
576 {
577 cur += 2;
578 break;
579 }
580
458 av_push (av, decode_ber ()); 581 av_push (av, decode_ber ());
582 }
583 }
584 else
585 {
586 UV len = get_length ();
587 UV seqend = (cur - buf) + len;
459 588
460 if (cur > buf + seqend) 589 while (cur < buf + seqend)
590 av_push (av, decode_ber ());
591
592 if (expect_false (cur > buf + seqend))
461 croak ("constructed type %02x overflow (%x %x)\n", identifier, cur - buf, seqend); 593 croak ("CONSTRUCTED type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
594 }
462 595
463 res = newRV_inc ((SV *)av); 596 res = newRV_inc ((SV *)av);
464 } 597 }
465 else 598 else
599 {
600 UV len = get_length ();
601
466 switch (profile_lookup (cur_profile, klass, tag)) 602 switch (profile_lookup (cur_profile, klass, tag))
467 { 603 {
468 case BER_TYPE_NULL: 604 case BER_TYPE_NULL:
605 if (expect_false (len))
606 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
607
469 res = &PL_sv_undef; 608 res = &PL_sv_undef;
470 break; 609 break;
471 610
472 case BER_TYPE_BOOL: 611 case BER_TYPE_BOOL:
473 {
474 U32 len = get_length ();
475
476 if (len != 1) 612 if (expect_false (len != 1))
477 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len); 613 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
478 614
479 res = newSVcacheint (get_u8 () ? 0 : 1); 615 res = newSVcacheint (!!get_u8 ());
480 }
481 break; 616 break;
482 617
483 case BER_TYPE_OID: 618 case BER_TYPE_OID:
484 res = decode_oid (0); 619 res = decode_oid (len, 0);
485 break; 620 break;
486 621
487 case BER_TYPE_RELOID: 622 case BER_TYPE_RELOID:
488 res = decode_oid (1); 623 res = decode_oid (len, 1);
489 break; 624 break;
490 625
491 case BER_TYPE_INT: 626 case BER_TYPE_INT:
492 res = decode_int (); 627 res = decode_int (len);
493 break; 628 break;
494 629
495 case BER_TYPE_UTF8: 630 case BER_TYPE_UTF8:
496 res = decode_data (); 631 res = decode_data (len);
497 SvUTF8_on (res); 632 SvUTF8_on (res);
498 break; 633 break;
499 634
500 case BER_TYPE_BYTES: 635 case BER_TYPE_BYTES:
501 res = decode_data (); 636 res = decode_data (len);
502 break; 637 break;
503 638
504 case BER_TYPE_IPADDRESS: 639 case BER_TYPE_IPADDRESS:
505 { 640 {
506 U32 len = get_length ();
507
508 if (len != 4) 641 if (len != 4)
509 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 642 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
510 643
511 U8 c1 = get_u8 (); 644 U8 *data = get_n (4);
512 U8 c2 = get_u8 (); 645 res = newSVpvf ("%d.%d.%d.%d", data [0], data [1], data [2], data [3]);
513 U8 c3 = get_u8 ();
514 U8 c4 = get_u8 ();
515
516 res = newSVpvf ("%d.%d.%d.%d", c1, c2, c3, c4);
517 } 646 }
518 break; 647 break;
519 648
520 case BER_TYPE_UCS2: 649 case BER_TYPE_UCS2:
521 res = decode_ucs (2); 650 res = decode_ucs (len, 2);
522 break; 651 break;
523 652
524 case BER_TYPE_UCS4: 653 case BER_TYPE_UCS4:
525 res = decode_ucs (4); 654 res = decode_ucs (len, 4);
526 break; 655 break;
527 656
528 case BER_TYPE_REAL: 657 case BER_TYPE_REAL:
658 res = decode_real (len);
659 break;
660
529 case BER_TYPE_CROAK: 661 case BER_TYPE_CROAK:
662 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
663
530 default: 664 default:
531 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 665 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
532 } 666 }
667 }
533 668
534 AV *av = newAV (); 669 AV *av = newAV ();
535 av_fill (av, BER_ARRAYSIZE - 1); 670 av_fill (av, BER_ARRAYSIZE - 1);
536 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 671 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
537 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 672 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
538 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 673 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
539 AvARRAY (av)[BER_DATA ] = res; 674 AvARRAY (av)[BER_DATA ] = res;
540 675
541 return newRV_noinc ((SV *)av); 676 return newRV_noinc ((SV *)av);
542} 677}
543 678
544///////////////////////////////////////////////////////////////////////////// 679/////////////////////////////////////////////////////////////////////////////
549strlen_sum (STRLEN l1, STRLEN l2) 684strlen_sum (STRLEN l1, STRLEN l2)
550{ 685{
551 size_t sum = l1 + l2; 686 size_t sum = l1 + l2;
552 687
553 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 688 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
554 croak ("JSON::XS: string size overflow"); 689 croak ("Convert::BER::XS: string size overflow");
555 690
556 return sum; 691 return sum;
557} 692}
558 693
559static void 694static void
597 need (1); 732 need (1);
598 *cur++ = val; 733 *cur++ = val;
599} 734}
600 735
601static void 736static void
602put_w_nocheck (U32 val) 737put_w_nocheck (UV val)
603{ 738{
739#if UVSIZE > 4
740 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
741 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
742 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
743 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
744 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
745#endif
604 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 746 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
605 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 747 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
606 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 748 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
607 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 749 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
608 *cur = val & 0x7f; cur += 1; 750 *cur = val & 0x7f; cur += 1;
609} 751}
610 752
611static void 753static void
612put_w (U32 val) 754put_w (UV val)
613{ 755{
614 need (5); // we only handle up to 5 bytes 756 need (5); // we only handle up to 5 bytes
615 757
616 put_w_nocheck (val); 758 put_w_nocheck (val);
617} 759}
618 760
619static U8 * 761static U8 *
620put_length_at (U32 val, U8 *cur) 762put_length_at (UV val, U8 *cur)
621{ 763{
622 if (val < 0x7fU) 764 if (val <= 0x7fU)
623 *cur++ = val; 765 *cur++ = val;
624 else 766 else
625 { 767 {
626 U8 *lenb = cur++; 768 U8 *lenb = cur++;
627 769
628 *cur = val >> 24; cur += *cur > 0; 770#if UVSIZE > 4
629 *cur = val >> 16; cur += *cur > 0; 771 *cur = val >> 56; cur += val >= ((UV)1 << (8 * 7));
630 *cur = val >> 8; cur += *cur > 0; 772 *cur = val >> 48; cur += val >= ((UV)1 << (8 * 6));
773 *cur = val >> 40; cur += val >= ((UV)1 << (8 * 5));
774 *cur = val >> 32; cur += val >= ((UV)1 << (8 * 4));
775#endif
776 *cur = val >> 24; cur += val >= ((UV)1 << (8 * 3));
777 *cur = val >> 16; cur += val >= ((UV)1 << (8 * 2));
778 *cur = val >> 8; cur += val >= ((UV)1 << (8 * 1));
631 *cur = val ; cur += 1; 779 *cur = val ; cur += 1;
632 780
633 *lenb = 0x80 + cur - lenb - 1; 781 *lenb = 0x80 + cur - lenb - 1;
634 } 782 }
635 783
636 return cur; 784 return cur;
637} 785}
638 786
639static void 787static void
640put_length (U32 val) 788put_length (UV val)
641{ 789{
642 need (5 + val); 790 need (9 + val);
643 cur = put_length_at (val, cur); 791 cur = put_length_at (val, cur);
644} 792}
645 793
646// return how many bytes the encoded length requires 794// return how many bytes the encoded length requires
647static int length_length (U32 val) 795static int length_length (UV val)
648{ 796{
649 return val < 0x7fU 797 // use hashing with a DeBruin sequence, anyone?
798 return expect_true (val <= 0x7fU)
650 ? 1 799 ? 1
651 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 800 : 2
801 + (val > 0x000000000000ffU)
802 + (val > 0x0000000000ffffU)
803 + (val > 0x00000000ffffffU)
804#if UVSIZE > 4
805 + (val > 0x000000ffffffffU)
806 + (val > 0x0000ffffffffffU)
807 + (val > 0x00ffffffffffffU)
808 + (val > 0xffffffffffffffU)
809#endif
810 ;
652} 811}
653 812
654static void 813static void
655encode_data (const char *ptr, STRLEN len) 814encode_data (const char *ptr, STRLEN len)
656{ 815{
718 877
719 *lenb = cur - lenb - 1; 878 *lenb = cur - lenb - 1;
720} 879}
721 880
722// we don't know the length yet, so we optimistically 881// we don't know the length yet, so we optimistically
723// assume the length will need one octet later. if that 882// assume the length will need one octet later. If that
724// turns out to be wrong, we memove as needed. 883// turns out to be wrong, we memmove as needed.
725// mark the beginning 884// mark the beginning
726static STRLEN 885static STRLEN
727len_fixup_mark () 886len_fixup_mark (void)
728{ 887{
729 return cur++ - buf; 888 return cur++ - buf;
730} 889}
731 890
732// patch up the length 891// patch up the length
789 } 948 }
790 949
791 len_fixup (mark); 950 len_fixup (mark);
792} 951}
793 952
794// check whether an SV is a BER tuple and returns its AV * 953static void
795static AV * 954encode_real (SV *data)
796ber_tuple (SV *tuple)
797{ 955{
798 SV *rv; 956 NV nv = SvNV (data);
799 957
800 if (expect_false (!SvROK (tuple) || SvTYPE ((rv = SvRV (tuple))) != SVt_PVAV)) 958 if (expect_false (nv == (NV)0.))
801 croak ("BER tuple must be array-reference"); 959 {
960 if (signbit (nv))
961 {
962 // negative zero
963 need (3);
964 *cur++ = 2;
965 *cur++ = 0x40;
966 *cur++ = 0x43;
967 }
968 else
969 {
970 // positive zero
971 need (1);
972 *cur++ = 0;
973 }
974 }
975 else if (expect_false (Perl_isinf (nv)))
976 {
977 need (3);
978 *cur++ = 2;
979 *cur++ = 0x40;
980 *cur++ = nv < (NV)0. ? 0x41 : 0x40;
981 }
982 else if (expect_false (Perl_isnan (nv)))
983 {
984 need (3);
985 *cur++ = 2;
986 *cur++ = 0x40;
987 *cur++ = 0x42;
988 }
989 else
990 {
991 // use decimal encoding
992 dSP;
993 SAVETMPS;
994 PUSHMARK (SP);
995 EXTEND (SP, 2);
996 PUSHs (data);
997 PUSHs (sv_2mortal (newSVcacheint (NV_DIG)));
998 PUTBACK;
999 call_pv ("Convert::BER::XS::_encode_real_decimal", G_SCALAR);
1000 SPAGAIN;
802 1001
803 if (expect_false (SvRMAGICAL (rv))) 1002 SV *sv = POPs;
804 croak ("BER tuple must not be tied"); 1003 STRLEN l;
1004 char *f = SvPV (sv, l);
805 1005
806 if (expect_false (AvFILL ((AV *)rv) != BER_ARRAYSIZE - 1)) 1006 put_length (l);
807 croak ("BER tuple must contain exactly %d elements, not %d", BER_ARRAYSIZE, AvFILL ((AV *)rv) + 1); 1007 memcpy (cur, f, l);
1008 cur += l;
808 1009
809 return (AV *)rv; 1010 PUTBACK;
1011 FREETMPS;
1012 }
810} 1013}
811 1014
812static void 1015static void
813encode_ucs (SV *data, int chrsize) 1016encode_ucs (SV *data, int chrsize)
814{ 1017{
834 1037
835 *cur++ = uchr >> 8; 1038 *cur++ = uchr >> 8;
836 *cur++ = uchr; 1039 *cur++ = uchr;
837 } 1040 }
838} 1041}
1042
1043// check whether an SV is a BER tuple and returns its AV *
1044static AV *
1045ber_tuple (SV *tuple)
1046{
1047 SV *rv;
1048
1049 if (expect_false (!SvROK (tuple) || SvTYPE ((rv = SvRV (tuple))) != SVt_PVAV))
1050 croak ("BER tuple must be array-reference");
1051
1052 if (expect_false (SvRMAGICAL (rv)))
1053 croak ("BER tuple must not be tied");
1054
1055 if (expect_false (AvFILL ((AV *)rv) != BER_ARRAYSIZE - 1))
1056 croak ("BER tuple must contain exactly %d elements, not %d", BER_ARRAYSIZE, AvFILL ((AV *)rv) + 1);
1057
1058 return (AV *)rv;
1059}
1060
839static void 1061static void
840encode_ber (SV *tuple) 1062encode_ber (SV *tuple)
841{ 1063{
842 AV *av = ber_tuple (tuple); 1064 AV *av = ber_tuple (tuple);
843 1065
844 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 1066 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
845 int tag = SvIV (AvARRAY (av)[BER_TAG]); 1067 int tag = SvIV (AvARRAY (av)[BER_TAG]);
846 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 1068 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
847 SV *data = AvARRAY (av)[BER_DATA]; 1069 SV *data = AvARRAY (av)[BER_DATA];
848 1070
849 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 1071 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
850 1072
851 if (expect_false (tag >= ASN_TAG_BER)) 1073 if (expect_false (tag >= ASN_TAG_BER))
862 // and adjust later 1084 // and adjust later
863 need (1); 1085 need (1);
864 STRLEN mark = len_fixup_mark (); 1086 STRLEN mark = len_fixup_mark ();
865 1087
866 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV)) 1088 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV))
867 croak ("BER constructed data must be array-reference"); 1089 croak ("BER CONSTRUCTED data must be array-reference");
868 1090
869 AV *av = (AV *)SvRV (data); 1091 AV *av = (AV *)SvRV (data);
870 int fill = AvFILL (av); 1092 int fill = AvFILL (av);
871 1093
872 if (expect_false (SvRMAGICAL (av))) 1094 if (expect_false (SvRMAGICAL (av)))
873 croak ("BER constructed data must not be tied"); 1095 croak ("BER CONSTRUCTED data must not be tied");
874 1096
875 int i; 1097 int i;
876 for (i = 0; i <= fill; ++i) 1098 for (i = 0; i <= fill; ++i)
877 encode_ber (AvARRAY (av)[i]); 1099 encode_ber (AvARRAY (av)[i]);
878 1100
885 put_length (0); 1107 put_length (0);
886 break; 1108 break;
887 1109
888 case BER_TYPE_BOOL: 1110 case BER_TYPE_BOOL:
889 put_length (1); 1111 put_length (1);
890 *cur++ = SvTRUE (data) ? 0xff : 0x00; 1112 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
891 break; 1113 break;
892 1114
893 case BER_TYPE_OID: 1115 case BER_TYPE_OID:
894 encode_oid (data, 0); 1116 encode_oid (data, 0);
895 break; 1117 break;
933 case BER_TYPE_UCS4: 1155 case BER_TYPE_UCS4:
934 encode_ucs (data, 4); 1156 encode_ucs (data, 4);
935 break; 1157 break;
936 1158
937 case BER_TYPE_REAL: 1159 case BER_TYPE_REAL:
1160 encode_real (data);
1161 break;
1162
938 case BER_TYPE_CROAK: 1163 case BER_TYPE_CROAK:
1164 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
1165
939 default: 1166 default:
940 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 1167 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
941 } 1168 }
942 1169
943} 1170}
958 const char *name; 1185 const char *name;
959 IV iv; 1186 IV iv;
960 } *civ, const_iv[] = { 1187 } *civ, const_iv[] = {
961#define const_iv(name) { # name, name }, 1188#define const_iv(name) { # name, name },
962 const_iv (ASN_BOOLEAN) 1189 const_iv (ASN_BOOLEAN)
963 const_iv (ASN_INTEGER32) 1190 const_iv (ASN_INTEGER)
964 const_iv (ASN_BIT_STRING) 1191 const_iv (ASN_BIT_STRING)
965 const_iv (ASN_OCTET_STRING) 1192 const_iv (ASN_OCTET_STRING)
966 const_iv (ASN_NULL) 1193 const_iv (ASN_NULL)
967 const_iv (ASN_OBJECT_IDENTIFIER) 1194 const_iv (ASN_OBJECT_IDENTIFIER)
968 const_iv (ASN_OBJECT_DESCRIPTOR) 1195 const_iv (ASN_OBJECT_DESCRIPTOR)
997 const_iv (ASN_CONTEXT) 1224 const_iv (ASN_CONTEXT)
998 const_iv (ASN_PRIVATE) 1225 const_iv (ASN_PRIVATE)
999 1226
1000 const_iv (BER_CLASS) 1227 const_iv (BER_CLASS)
1001 const_iv (BER_TAG) 1228 const_iv (BER_TAG)
1002 const_iv (BER_CONSTRUCTED) 1229 const_iv (BER_FLAGS)
1003 const_iv (BER_DATA) 1230 const_iv (BER_DATA)
1004 1231
1005 const_iv (BER_TYPE_BYTES) 1232 const_iv (BER_TYPE_BYTES)
1006 const_iv (BER_TYPE_UTF8) 1233 const_iv (BER_TYPE_UTF8)
1007 const_iv (BER_TYPE_UCS2) 1234 const_iv (BER_TYPE_UCS2)
1015 const_iv (BER_TYPE_IPADDRESS) 1242 const_iv (BER_TYPE_IPADDRESS)
1016 const_iv (BER_TYPE_CROAK) 1243 const_iv (BER_TYPE_CROAK)
1017 1244
1018 const_iv (SNMP_IPADDRESS) 1245 const_iv (SNMP_IPADDRESS)
1019 const_iv (SNMP_COUNTER32) 1246 const_iv (SNMP_COUNTER32)
1247 const_iv (SNMP_GAUGE32)
1020 const_iv (SNMP_UNSIGNED32) 1248 const_iv (SNMP_UNSIGNED32)
1021 const_iv (SNMP_TIMETICKS) 1249 const_iv (SNMP_TIMETICKS)
1022 const_iv (SNMP_OPAQUE) 1250 const_iv (SNMP_OPAQUE)
1023 const_iv (SNMP_COUNTER64) 1251 const_iv (SNMP_COUNTER64)
1024 }; 1252 };
1025 1253
1026 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) 1254 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
1027 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1255 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1028} 1256}
1029 1257
1030SV * 1258void
1031ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1259ber_decode (SV *ber, SV *profile = &PL_sv_undef)
1260 ALIAS:
1261 ber_decode_prefix = 1
1032 CODE: 1262 PPCODE:
1033{ 1263{
1034 cur_profile = SvPROFILE (profile); 1264 cur_profile = SvPROFILE (profile);
1035 STRLEN len; 1265 STRLEN len;
1036 buf = (U8 *)SvPVbyte (ber, len); 1266 buf = (U8 *)SvPVbyte (ber, len);
1037 cur = buf; 1267 cur = buf;
1038 end = buf + len; 1268 end = buf + len;
1039 1269
1270 PUTBACK;
1040 RETVAL = decode_ber (); 1271 SV *tuple = decode_ber ();
1272 SPAGAIN;
1273
1274 EXTEND (SP, 2);
1275 PUSHs (sv_2mortal (tuple));
1276
1277 if (ix)
1278 PUSHs (sv_2mortal (newSViv (cur - buf)));
1279 else if (cur != end)
1280 error ("trailing garbage after BER value");
1041} 1281}
1042 OUTPUT: RETVAL
1043 1282
1044void 1283void
1045ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &PL_sv_undef, SV *data = &PL_sv_undef) 1284ber_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: 1285 PPCODE:
1047{ 1286{
1048 if (!SvOK (tuple)) 1287 if (!SvOK (tuple))
1049 XSRETURN_NO; 1288 XSRETURN_NO;
1050 1289
1052 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1291 croak ("ber_is: tuple must be BER tuple (array-ref)");
1053 1292
1054 AV *av = (AV *)SvRV (tuple); 1293 AV *av = (AV *)SvRV (tuple);
1055 1294
1056 XPUSHs ( 1295 XPUSHs (
1057 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1296 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1058 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1297 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1059 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1298 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1060 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1299 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1061 ? &PL_sv_yes : &PL_sv_undef); 1300 ? &PL_sv_yes : &PL_sv_undef);
1062} 1301}
1063 1302
1064void 1303void
1065ber_is_seq (SV *tuple) 1304ber_is_seq (SV *tuple)
1069 XSRETURN_UNDEF; 1308 XSRETURN_UNDEF;
1070 1309
1071 AV *av = ber_tuple (tuple); 1310 AV *av = ber_tuple (tuple);
1072 1311
1073 XPUSHs ( 1312 XPUSHs (
1074 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1313 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1075 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1314 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1076 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1315 && SvIV (AvARRAY (av)[BER_FLAGS])
1077 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1316 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1078} 1317}
1079 1318
1080void 1319void
1081ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1320ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1082 PPCODE: 1321 PPCODE:
1083{ 1322{
1084 if (!SvOK (tuple)) 1323 if (!SvOK (tuple))
1085 XSRETURN_NO; 1324 XSRETURN_NO;
1086 1325
1087 AV *av = ber_tuple (tuple); 1326 AV *av = ber_tuple (tuple);
1088 1327
1089 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1328 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1090 1329
1091 XPUSHs ( 1330 XPUSHs (
1092 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1331 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1093 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1332 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1094 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1333 && !SvIV (AvARRAY (av)[BER_FLAGS])
1095 && (!SvOK (value) || data == SvIV (value)) 1334 && (!SvOK (value) || data == SvUV (value))
1096 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1335 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1097 : &PL_sv_undef); 1336 : &PL_sv_undef);
1098} 1337}
1099 1338
1100void 1339void
1101ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1340ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
1105 XSRETURN_NO; 1344 XSRETURN_NO;
1106 1345
1107 AV *av = ber_tuple (tuple); 1346 AV *av = ber_tuple (tuple);
1108 1347
1109 XPUSHs ( 1348 XPUSHs (
1110 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1349 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1111 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1350 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1112 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1351 && !SvIV (AvARRAY (av)[BER_FLAGS])
1113 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1352 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1114 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1353 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1115} 1354}
1116 1355
1117############################################################################# 1356#############################################################################
1123 cur_profile = SvPROFILE (profile); 1362 cur_profile = SvPROFILE (profile);
1124 buf_sv = sv_2mortal (NEWSV (0, 256)); 1363 buf_sv = sv_2mortal (NEWSV (0, 256));
1125 SvPOK_only (buf_sv); 1364 SvPOK_only (buf_sv);
1126 set_buf (buf_sv); 1365 set_buf (buf_sv);
1127 1366
1367 PUTBACK;
1128 encode_ber (tuple); 1368 encode_ber (tuple);
1369 SPAGAIN;
1129 1370
1130 SvCUR_set (buf_sv, cur - buf); 1371 SvCUR_set (buf_sv, cur - buf);
1131 XPUSHs (buf_sv); 1372 XPUSHs (buf_sv);
1132} 1373}
1133 1374
1134SV * 1375SV *
1135ber_i32 (IV iv) 1376ber_int (SV *sv)
1136 CODE: 1377 CODE:
1137{ 1378{
1138 AV *av = newAV (); 1379 AV *av = newAV ();
1139 av_fill (av, BER_ARRAYSIZE - 1); 1380 av_fill (av, BER_ARRAYSIZE - 1);
1140 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1381 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1141 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1382 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1142 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1383 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1143 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1384 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1144 RETVAL = newRV_noinc ((SV *)av); 1385 RETVAL = newRV_noinc ((SV *)av);
1145} 1386}
1146 OUTPUT: RETVAL 1387 OUTPUT: RETVAL
1147 1388
1148# TODO: not arrayref, but elements? 1389# TODO: not arrayref, but elements?
1150ber_seq (SV *arrayref) 1391ber_seq (SV *arrayref)
1151 CODE: 1392 CODE:
1152{ 1393{
1153 AV *av = newAV (); 1394 AV *av = newAV ();
1154 av_fill (av, BER_ARRAYSIZE - 1); 1395 av_fill (av, BER_ARRAYSIZE - 1);
1155 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1396 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1156 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1397 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1157 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1398 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1158 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1399 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1159 RETVAL = newRV_noinc ((SV *)av); 1400 RETVAL = newRV_noinc ((SV *)av);
1160} 1401}
1161 OUTPUT: RETVAL 1402 OUTPUT: RETVAL
1162 1403
1163MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1404MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines