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.30 by root, Tue Apr 23 20:03:08 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,
55 ASN_CLASS_SHIFT = 6, 58 ASN_CLASS_SHIFT = 6,
56 59
57 // ASN_APPLICATION SNMP 60 // ASN_APPLICATION SNMP
58 SNMP_IPADDRESS = 0x00, 61 SNMP_IPADDRESS = 0x00,
59 SNMP_COUNTER32 = 0x01, 62 SNMP_COUNTER32 = 0x01,
63 SNMP_GAUGE32 = 0x02,
60 SNMP_UNSIGNED32 = 0x02, 64 SNMP_UNSIGNED32 = 0x02,
61 SNMP_TIMETICKS = 0x03, 65 SNMP_TIMETICKS = 0x03,
62 SNMP_OPAQUE = 0x04, 66 SNMP_OPAQUE = 0x04,
63 SNMP_COUNTER64 = 0x06, 67 SNMP_COUNTER64 = 0x06,
64}; 68};
65 69
70// tlow-level types this module can ecode the above (and more) into
66enum { 71enum {
67 BER_TYPE_BYTES, 72 BER_TYPE_BYTES,
68 BER_TYPE_UTF8, 73 BER_TYPE_UTF8,
69 BER_TYPE_UCS2, 74 BER_TYPE_UCS2,
70 BER_TYPE_UCS4, 75 BER_TYPE_UCS4,
76 BER_TYPE_REAL, 81 BER_TYPE_REAL,
77 BER_TYPE_IPADDRESS, 82 BER_TYPE_IPADDRESS,
78 BER_TYPE_CROAK, 83 BER_TYPE_CROAK,
79}; 84};
80 85
86// tuple array indices
81enum { 87enum {
82 BER_CLASS = 0, 88 BER_CLASS = 0,
83 BER_TAG = 1, 89 BER_TAG = 1,
84 BER_CONSTRUCTED = 2, 90 BER_FLAGS = 2,
85 BER_DATA = 3, 91 BER_DATA = 3,
86 BER_ARRAYSIZE 92 BER_ARRAYSIZE
87}; 93};
88 94
89#define MAX_OID_STRLEN 4096 95#define MAX_OID_STRLEN 4096
90 96
137{ 143{
138 if (!SvOK (profile)) 144 if (!SvOK (profile))
139 return default_profile; 145 return default_profile;
140 146
141 if (!SvROK (profile)) 147 if (!SvROK (profile))
142 croak ("invalid profile"); 148 croak ("Convert::BER::XS::Profile expected");
143 149
144 profile = SvRV (profile); 150 profile = SvRV (profile);
145 151
146 if (SvSTASH (profile) != profile_stash) 152 if (SvSTASH (profile) != profile_stash)
147 croak ("invalid profile object"); 153 croak ("Convert::BER::XS::Profile expected");
148 154
149 return (void *)profile; 155 return (void *)profile;
150} 156}
151 157
152static int 158static int
178 184
179 SvPVX (sv)[idx] = type; 185 SvPVX (sv)[idx] = type;
180} 186}
181 187
182static SV * 188static SV *
183profile_new () 189profile_new (void)
184{ 190{
185 SV *sv = newSVpvn ("", 0); 191 SV *sv = newSVpvn ("", 0);
186 192
187 static const struct { 193 static const struct {
188 int klass; 194 int klass;
189 int tag; 195 int tag;
190 int type; 196 int type;
191 } *celem, default_map[] = { 197 } *celem, default_map[] = {
192 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL }, 198 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },
193 { ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT }, 199 { ASN_UNIVERSAL, ASN_INTEGER , BER_TYPE_INT },
194 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL }, 200 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },
195 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID }, 201 { 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 }, 202 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
198 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL }, 203 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
204 { ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
199 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 }, 205 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },
200 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 }, 206 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },
201 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 }, 207 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },
202 }; 208 };
203 209
224} 230}
225 231
226// get_* functions fetch something from the buffer 232// get_* functions fetch something from the buffer
227// decode_* functions use get_* fun ctions to decode ber values 233// decode_* functions use get_* fun ctions to decode ber values
228 234
235// get single octet
236static U8
237get_u8 (void)
238{
239 if (cur == end)
240 error ("unexpected end of message buffer");
241
242 return *cur++;
243}
244
229// get n octets 245// get n octets
230static U8 * 246static U8 *
231get_n (UV count) 247get_n (UV count)
232{ 248{
233 want (count); 249 want (count);
234 U8 *res = cur; 250 U8 *res = cur;
235 cur += count; 251 cur += count;
236 return res; 252 return res;
237} 253}
238 254
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") 255// get ber-encoded integer (i.e. pack "w")
250static U32 256static UV
251get_w (void) 257get_w (void)
252{ 258{
253 U32 res = 0; 259 UV res = 0;
260 U8 c = get_u8 ();
261
262 if (expect_false (c == 0x80))
263 error ("illegal BER padding (X.690 8.1.2.4.2, 8.19.2)");
254 264
255 for (;;) 265 for (;;)
256 { 266 {
257 U8 c = get_u8 (); 267 if (expect_false (res >> UVSIZE * 8 - 7))
268 error ("BER variable length integer overflow");
269
258 res = (res << 7) | (c & 0x7f); 270 res = (res << 7) | (c & 0x7f);
259 271
260 if (!(c & 0x80)) 272 if (expect_true (!(c & 0x80)))
261 return res; 273 return res;
262 }
263}
264 274
275 c = get_u8 ();
276 }
277}
278
265static U32 279static UV
266get_length (void) 280get_length (void)
267{ 281{
268 U32 res = get_u8 (); 282 UV res = get_u8 ();
269 283
270 if (res & 0x80) 284 if (expect_false (res & 0x80))
271 { 285 {
272 int cnt = res & 0x7f; 286 U8 cnt = res & 0x7f;
287
288 // this genewrates quite ugly code, but the overhead
289 // of copying the bytes for these lengths is probably so high
290 // that a slightly inefficient get_length won't matter.
291
292 if (expect_false (cnt == 0))
293 error ("indefinite BER value lengths not supported");
294
295 if (expect_false (cnt > UVSIZE))
296 error ("BER value length too long (must fit into UV) or BER reserved value in length (X.690 8.1.3.5)");
297
298 want (cnt);
299
273 res = 0; 300 res = 0;
274 301 do
275 switch (cnt) 302 res = (res << 8) | *cur++;
276 { 303 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 } 304 }
291 305
292 return res; 306 return res;
293} 307}
294 308
295static SV * 309static SV *
296decode_int () 310decode_int (UV len)
297{ 311{
298 int len = get_length ();
299
300 if (len <= 0) 312 if (!len)
301 { 313 error ("invalid BER_TYPE_INT length zero (X.690 8.3.1)");
302 error ("integer length equal to zero");
303 return 0;
304 }
305 314
306 U8 *data = get_n (len); 315 U8 *data = get_n (len);
307 316
317 if (expect_false (len > 1))
318 {
319 U16 mask = (data [0] << 8) | data [1] & 0xff80;
320
321 if (expect_false (mask == 0xff80 || mask == 0x0000))
322 error ("illegal padding in BER_TYPE_INT (X.690 8.3.2)");
323 }
324
308 int negative = data [0] & 0x80; 325 int negative = data [0] & 0x80;
309 326
310 UV val = negative ? -1 : 0; // copy signbit to all bits 327 UV val = negative ? -1 : 0; // copy signbit to all bits
328
329 if (len > UVSIZE + (!negative && !*data))
330 error ("BER_TYPE_INT overflow");
311 331
312 do 332 do
313 val = (val << 8) | *data++; 333 val = (val << 8) | *data++;
314 while (--len); 334 while (--len);
315 335
317 // but that's ok, as perl relies on it as well. 337 // but that's ok, as perl relies on it as well.
318 return negative ? newSViv ((IV)val) : newSVuv (val); 338 return negative ? newSViv ((IV)val) : newSVuv (val);
319} 339}
320 340
321static SV * 341static SV *
322decode_data (void) 342decode_data (UV len)
323{ 343{
324 U32 len = get_length ();
325 U8 *data = get_n (len);
326 return newSVpvn ((char *)data, len); 344 return newSVpvn ((char *)get_n (len), len);
327} 345}
328 346
329// gelper for decode_object_identifier 347// helper for decode_object_identifier
330static char * 348static char *
331write_uv (char *buf, U32 u) 349write_uv (char *buf, UV u)
332{ 350{
333 // the one-digit case is absolutely predominant, so this pays off (hopefully) 351 // the one-digit case is absolutely predominant, so this pays off (hopefully)
334 if (expect_true (u < 10)) 352 if (expect_true (u < 10))
335 *buf++ = u + '0'; 353 *buf++ = u + '0';
336 else 354 else
337 { 355 {
356 // this *could* be done much faster using branchless fixed-point arithmetics
338 char *beg = buf; 357 char *beg = buf;
339 358
340 do 359 do
341 { 360 {
342 *buf++ = u % 10 + '0'; 361 *buf++ = u % 10 + '0';
344 } 363 }
345 while (u); 364 while (u);
346 365
347 // reverse digits 366 // reverse digits
348 char *ptr = buf; 367 char *ptr = buf;
349 while (--ptr != beg) 368 while (--ptr > beg)
350 { 369 {
351 char c = *ptr; 370 char c = *ptr;
352 *ptr = *beg; 371 *ptr = *beg;
353 *beg = c; 372 *beg = c;
354 ++beg; 373 ++beg;
357 376
358 return buf; 377 return buf;
359} 378}
360 379
361static SV * 380static SV *
362decode_oid (int relative) 381decode_oid (UV len, int relative)
363{ 382{
364 U32 len = get_length ();
365
366 if (len <= 0) 383 if (len <= 0)
367 { 384 {
368 error ("OBJECT IDENTIFIER length equal to zero"); 385 error ("BER_TYPE_OID length must not be zero");
369 return &PL_sv_undef; 386 return &PL_sv_undef;
370 } 387 }
371 388
372 U8 *end = cur + len; 389 U8 *end = cur + len;
373 U32 w = get_w (); 390 UV w = get_w ();
374 391
375 static char oid[MAX_OID_STRLEN]; // must be static 392 static char oid[MAX_OID_STRLEN]; // static, because too large for stack
376 char *app = oid; 393 char *app = oid;
377 394
378 if (relative) 395 if (relative)
379 app = write_uv (app, w); 396 app = write_uv (app, w);
380 else 397 else
381 { 398 {
399 UV w1, w2;
400
401 if (w < 2 * 40)
402 (w1 = w / 40), (w2 = w % 40);
403 else
404 (w1 = 2), (w2 = w - 2 * 40);
405
382 app = write_uv (app, (U8)w / 40); 406 app = write_uv (app, w1);
383 *app++ = '.'; 407 *app++ = '.';
384 app = write_uv (app, (U8)w % 40); 408 app = write_uv (app, w2);
409 }
410
411 while (cur < end)
385 } 412 {
386
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
395 return newSVpvn (oid, app - oid); 422 return newSVpvn (oid, app - oid);
396} 423}
397 424
398// TODO: this is unacceptably slow 425// TODO: this is unacceptably slow
399static SV * 426static SV *
400decode_ucs (int chrsize) 427decode_ucs (UV len, int chrsize)
401{ 428{
402 SV *res = NEWSV (0, 0);
403
404 U32 len = get_length ();
405
406 if (len & (chrsize - 1)) 429 if (len & (chrsize - 1))
407 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len); 430 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
431
432 SV *res = NEWSV (0, 0);
408 433
409 while (len) 434 while (len)
410 { 435 {
411 U8 b1 = get_u8 (); 436 U8 b1 = get_u8 ();
412 U8 b2 = get_u8 (); 437 U8 b2 = get_u8 ();
430 455
431 return res; 456 return res;
432} 457}
433 458
434static SV * 459static SV *
435decode_ber () 460decode_ber (void)
436{ 461{
437 int identifier = get_u8 (); 462 int identifier = get_u8 ();
438 463
439 SV *res; 464 SV *res;
440 465
443 int tag = identifier & ASN_TAG_MASK; 468 int tag = identifier & ASN_TAG_MASK;
444 469
445 if (tag == ASN_TAG_BER) 470 if (tag == ASN_TAG_BER)
446 tag = get_w (); 471 tag = get_w ();
447 472
448 if (tag == ASN_TAG_BER)
449 tag = get_w ();
450
451 if (constructed) 473 if (constructed)
452 { 474 {
453 U32 len = get_length (); 475 UV len = get_length ();
454 U32 seqend = (cur - buf) + len; 476 UV seqend = (cur - buf) + len;
455 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 477 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
456 478
457 while (cur < buf + seqend) 479 while (cur < buf + seqend)
458 av_push (av, decode_ber ()); 480 av_push (av, decode_ber ());
459 481
460 if (cur > buf + seqend) 482 if (expect_false (cur > buf + seqend))
461 croak ("constructed type %02x overflow (%x %x)\n", identifier, cur - buf, seqend); 483 croak ("CONSTRUCTED type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
462 484
463 res = newRV_inc ((SV *)av); 485 res = newRV_inc ((SV *)av);
464 } 486 }
465 else 487 else
488 {
489 UV len = get_length ();
490
466 switch (profile_lookup (cur_profile, klass, tag)) 491 switch (profile_lookup (cur_profile, klass, tag))
467 { 492 {
468 case BER_TYPE_NULL: 493 case BER_TYPE_NULL:
494 if (expect_false (len))
495 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
496
469 res = &PL_sv_undef; 497 res = &PL_sv_undef;
470 break; 498 break;
471 499
472 case BER_TYPE_BOOL: 500 case BER_TYPE_BOOL:
473 {
474 U32 len = get_length ();
475
476 if (len != 1) 501 if (expect_false (len != 1))
477 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len); 502 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
478 503
479 res = newSVcacheint (get_u8 () ? 0 : 1); 504 res = newSVcacheint (!!get_u8 ());
480 }
481 break; 505 break;
482 506
483 case BER_TYPE_OID: 507 case BER_TYPE_OID:
484 res = decode_oid (0); 508 res = decode_oid (len, 0);
485 break; 509 break;
486 510
487 case BER_TYPE_RELOID: 511 case BER_TYPE_RELOID:
488 res = decode_oid (1); 512 res = decode_oid (len, 1);
489 break; 513 break;
490 514
491 case BER_TYPE_INT: 515 case BER_TYPE_INT:
492 res = decode_int (); 516 res = decode_int (len);
493 break; 517 break;
494 518
495 case BER_TYPE_UTF8: 519 case BER_TYPE_UTF8:
496 res = decode_data (); 520 res = decode_data (len);
497 SvUTF8_on (res); 521 SvUTF8_on (res);
498 break; 522 break;
499 523
500 case BER_TYPE_BYTES: 524 case BER_TYPE_BYTES:
501 res = decode_data (); 525 res = decode_data (len);
502 break; 526 break;
503 527
504 case BER_TYPE_IPADDRESS: 528 case BER_TYPE_IPADDRESS:
505 { 529 {
506 U32 len = get_length ();
507
508 if (len != 4) 530 if (len != 4)
509 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 531 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
510 532
511 U8 c1 = get_u8 (); 533 U8 *data = get_n (4);
512 U8 c2 = get_u8 (); 534 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 } 535 }
518 break; 536 break;
519 537
520 case BER_TYPE_UCS2: 538 case BER_TYPE_UCS2:
521 res = decode_ucs (2); 539 res = decode_ucs (len, 2);
522 break; 540 break;
523 541
524 case BER_TYPE_UCS4: 542 case BER_TYPE_UCS4:
525 res = decode_ucs (4); 543 res = decode_ucs (len, 4);
526 break; 544 break;
527 545
528 case BER_TYPE_REAL: 546 case BER_TYPE_REAL:
547 error ("BER_TYPE_REAL not implemented");
548
529 case BER_TYPE_CROAK: 549 case BER_TYPE_CROAK:
550 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
551
530 default: 552 default:
531 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 553 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
532 } 554 }
555 }
533 556
534 AV *av = newAV (); 557 AV *av = newAV ();
535 av_fill (av, BER_ARRAYSIZE - 1); 558 av_fill (av, BER_ARRAYSIZE - 1);
536 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 559 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
537 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 560 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
538 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 561 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
539 AvARRAY (av)[BER_DATA ] = res; 562 AvARRAY (av)[BER_DATA ] = res;
540 563
541 return newRV_noinc ((SV *)av); 564 return newRV_noinc ((SV *)av);
542} 565}
543 566
544///////////////////////////////////////////////////////////////////////////// 567/////////////////////////////////////////////////////////////////////////////
549strlen_sum (STRLEN l1, STRLEN l2) 572strlen_sum (STRLEN l1, STRLEN l2)
550{ 573{
551 size_t sum = l1 + l2; 574 size_t sum = l1 + l2;
552 575
553 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 576 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
554 croak ("JSON::XS: string size overflow"); 577 croak ("Convert::BER::XS: string size overflow");
555 578
556 return sum; 579 return sum;
557} 580}
558 581
559static void 582static void
597 need (1); 620 need (1);
598 *cur++ = val; 621 *cur++ = val;
599} 622}
600 623
601static void 624static void
602put_w_nocheck (U32 val) 625put_w_nocheck (UV val)
603{ 626{
627#if UVSIZE > 4
628 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
629 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
630 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
631 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
632 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
633#endif
604 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 634 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
605 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 635 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
606 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 636 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
607 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 637 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
608 *cur = val & 0x7f; cur += 1; 638 *cur = val & 0x7f; cur += 1;
609} 639}
610 640
611static void 641static void
612put_w (U32 val) 642put_w (UV val)
613{ 643{
614 need (5); // we only handle up to 5 bytes 644 need (5); // we only handle up to 5 bytes
615 645
616 put_w_nocheck (val); 646 put_w_nocheck (val);
617} 647}
618 648
619static U8 * 649static U8 *
620put_length_at (U32 val, U8 *cur) 650put_length_at (UV val, U8 *cur)
621{ 651{
622 if (val < 0x7fU) 652 if (val <= 0x7fU)
623 *cur++ = val; 653 *cur++ = val;
624 else 654 else
625 { 655 {
626 U8 *lenb = cur++; 656 U8 *lenb = cur++;
627 657
628 *cur = val >> 24; cur += *cur > 0; 658#if UVSIZE > 4
629 *cur = val >> 16; cur += *cur > 0; 659 *cur = val >> 56; cur += val >= ((UV)1 << (8 * 7));
630 *cur = val >> 8; cur += *cur > 0; 660 *cur = val >> 48; cur += val >= ((UV)1 << (8 * 6));
661 *cur = val >> 40; cur += val >= ((UV)1 << (8 * 5));
662 *cur = val >> 32; cur += val >= ((UV)1 << (8 * 4));
663#endif
664 *cur = val >> 24; cur += val >= ((UV)1 << (8 * 3));
665 *cur = val >> 16; cur += val >= ((UV)1 << (8 * 2));
666 *cur = val >> 8; cur += val >= ((UV)1 << (8 * 1));
631 *cur = val ; cur += 1; 667 *cur = val ; cur += 1;
632 668
633 *lenb = 0x80 + cur - lenb - 1; 669 *lenb = 0x80 + cur - lenb - 1;
634 } 670 }
635 671
636 return cur; 672 return cur;
637} 673}
638 674
639static void 675static void
640put_length (U32 val) 676put_length (UV val)
641{ 677{
642 need (5 + val); 678 need (9 + val);
643 cur = put_length_at (val, cur); 679 cur = put_length_at (val, cur);
644} 680}
645 681
646// return how many bytes the encoded length requires 682// return how many bytes the encoded length requires
647static int length_length (U32 val) 683static int length_length (UV val)
648{ 684{
649 return val < 0x7fU 685 // use hashing with a DeBruin sequence, anyone?
686 return expect_true (val <= 0x7fU)
650 ? 1 687 ? 1
651 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 688 : 2
689 + (val > 0x000000000000ffU)
690 + (val > 0x0000000000ffffU)
691 + (val > 0x00000000ffffffU)
692#if UVSIZE > 4
693 + (val > 0x000000ffffffffU)
694 + (val > 0x0000ffffffffffU)
695 + (val > 0x00ffffffffffffU)
696 + (val > 0xffffffffffffffU)
697#endif
698 ;
652} 699}
653 700
654static void 701static void
655encode_data (const char *ptr, STRLEN len) 702encode_data (const char *ptr, STRLEN len)
656{ 703{
718 765
719 *lenb = cur - lenb - 1; 766 *lenb = cur - lenb - 1;
720} 767}
721 768
722// we don't know the length yet, so we optimistically 769// we don't know the length yet, so we optimistically
723// assume the length will need one octet later. if that 770// assume the length will need one octet later. If that
724// turns out to be wrong, we memove as needed. 771// turns out to be wrong, we memmove as needed.
725// mark the beginning 772// mark the beginning
726static STRLEN 773static STRLEN
727len_fixup_mark () 774len_fixup_mark (void)
728{ 775{
729 return cur++ - buf; 776 return cur++ - buf;
730} 777}
731 778
732// patch up the length 779// patch up the length
841{ 888{
842 AV *av = ber_tuple (tuple); 889 AV *av = ber_tuple (tuple);
843 890
844 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 891 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
845 int tag = SvIV (AvARRAY (av)[BER_TAG]); 892 int tag = SvIV (AvARRAY (av)[BER_TAG]);
846 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 893 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
847 SV *data = AvARRAY (av)[BER_DATA]; 894 SV *data = AvARRAY (av)[BER_DATA];
848 895
849 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 896 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
850 897
851 if (expect_false (tag >= ASN_TAG_BER)) 898 if (expect_false (tag >= ASN_TAG_BER))
862 // and adjust later 909 // and adjust later
863 need (1); 910 need (1);
864 STRLEN mark = len_fixup_mark (); 911 STRLEN mark = len_fixup_mark ();
865 912
866 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV)) 913 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV))
867 croak ("BER constructed data must be array-reference"); 914 croak ("BER CONSTRUCTED data must be array-reference");
868 915
869 AV *av = (AV *)SvRV (data); 916 AV *av = (AV *)SvRV (data);
870 int fill = AvFILL (av); 917 int fill = AvFILL (av);
871 918
872 if (expect_false (SvRMAGICAL (av))) 919 if (expect_false (SvRMAGICAL (av)))
873 croak ("BER constructed data must not be tied"); 920 croak ("BER CONSTRUCTED data must not be tied");
874 921
875 int i; 922 int i;
876 for (i = 0; i <= fill; ++i) 923 for (i = 0; i <= fill; ++i)
877 encode_ber (AvARRAY (av)[i]); 924 encode_ber (AvARRAY (av)[i]);
878 925
885 put_length (0); 932 put_length (0);
886 break; 933 break;
887 934
888 case BER_TYPE_BOOL: 935 case BER_TYPE_BOOL:
889 put_length (1); 936 put_length (1);
890 *cur++ = SvTRUE (data) ? 0xff : 0x00; 937 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
891 break; 938 break;
892 939
893 case BER_TYPE_OID: 940 case BER_TYPE_OID:
894 encode_oid (data, 0); 941 encode_oid (data, 0);
895 break; 942 break;
933 case BER_TYPE_UCS4: 980 case BER_TYPE_UCS4:
934 encode_ucs (data, 4); 981 encode_ucs (data, 4);
935 break; 982 break;
936 983
937 case BER_TYPE_REAL: 984 case BER_TYPE_REAL:
985 croak ("BER_TYPE_REAL not implemented");
986
938 case BER_TYPE_CROAK: 987 case BER_TYPE_CROAK:
988 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
989
939 default: 990 default:
940 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 991 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
941 } 992 }
942 993
943} 994}
958 const char *name; 1009 const char *name;
959 IV iv; 1010 IV iv;
960 } *civ, const_iv[] = { 1011 } *civ, const_iv[] = {
961#define const_iv(name) { # name, name }, 1012#define const_iv(name) { # name, name },
962 const_iv (ASN_BOOLEAN) 1013 const_iv (ASN_BOOLEAN)
963 const_iv (ASN_INTEGER32) 1014 const_iv (ASN_INTEGER)
964 const_iv (ASN_BIT_STRING) 1015 const_iv (ASN_BIT_STRING)
965 const_iv (ASN_OCTET_STRING) 1016 const_iv (ASN_OCTET_STRING)
966 const_iv (ASN_NULL) 1017 const_iv (ASN_NULL)
967 const_iv (ASN_OBJECT_IDENTIFIER) 1018 const_iv (ASN_OBJECT_IDENTIFIER)
968 const_iv (ASN_OBJECT_DESCRIPTOR) 1019 const_iv (ASN_OBJECT_DESCRIPTOR)
997 const_iv (ASN_CONTEXT) 1048 const_iv (ASN_CONTEXT)
998 const_iv (ASN_PRIVATE) 1049 const_iv (ASN_PRIVATE)
999 1050
1000 const_iv (BER_CLASS) 1051 const_iv (BER_CLASS)
1001 const_iv (BER_TAG) 1052 const_iv (BER_TAG)
1002 const_iv (BER_CONSTRUCTED) 1053 const_iv (BER_FLAGS)
1003 const_iv (BER_DATA) 1054 const_iv (BER_DATA)
1004 1055
1005 const_iv (BER_TYPE_BYTES) 1056 const_iv (BER_TYPE_BYTES)
1006 const_iv (BER_TYPE_UTF8) 1057 const_iv (BER_TYPE_UTF8)
1007 const_iv (BER_TYPE_UCS2) 1058 const_iv (BER_TYPE_UCS2)
1015 const_iv (BER_TYPE_IPADDRESS) 1066 const_iv (BER_TYPE_IPADDRESS)
1016 const_iv (BER_TYPE_CROAK) 1067 const_iv (BER_TYPE_CROAK)
1017 1068
1018 const_iv (SNMP_IPADDRESS) 1069 const_iv (SNMP_IPADDRESS)
1019 const_iv (SNMP_COUNTER32) 1070 const_iv (SNMP_COUNTER32)
1071 const_iv (SNMP_GAUGE32)
1020 const_iv (SNMP_UNSIGNED32) 1072 const_iv (SNMP_UNSIGNED32)
1021 const_iv (SNMP_TIMETICKS) 1073 const_iv (SNMP_TIMETICKS)
1022 const_iv (SNMP_OPAQUE) 1074 const_iv (SNMP_OPAQUE)
1023 const_iv (SNMP_COUNTER64) 1075 const_iv (SNMP_COUNTER64)
1024 }; 1076 };
1025 1077
1026 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) 1078 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)); 1079 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1028} 1080}
1029 1081
1030SV * 1082void
1031ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1083ber_decode (SV *ber, SV *profile = &PL_sv_undef)
1084 ALIAS:
1085 ber_decode_prefix = 1
1032 CODE: 1086 PPCODE:
1033{ 1087{
1034 cur_profile = SvPROFILE (profile); 1088 cur_profile = SvPROFILE (profile);
1035 STRLEN len; 1089 STRLEN len;
1036 buf = (U8 *)SvPVbyte (ber, len); 1090 buf = (U8 *)SvPVbyte (ber, len);
1037 cur = buf; 1091 cur = buf;
1038 end = buf + len; 1092 end = buf + len;
1039 1093
1040 RETVAL = decode_ber (); 1094 SV *tuple = decode_ber ();
1095
1096 EXTEND (SP, 2);
1097 PUSHs (sv_2mortal (tuple));
1098
1099 if (ix)
1100 PUSHs (sv_2mortal (newSViv (cur - buf)));
1101 else if (cur != end)
1102 error ("trailing garbage after BER value");
1041} 1103}
1042 OUTPUT: RETVAL
1043 1104
1044void 1105void
1045ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &PL_sv_undef, SV *data = &PL_sv_undef) 1106ber_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: 1107 PPCODE:
1047{ 1108{
1048 if (!SvOK (tuple)) 1109 if (!SvOK (tuple))
1049 XSRETURN_NO; 1110 XSRETURN_NO;
1050 1111
1052 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1113 croak ("ber_is: tuple must be BER tuple (array-ref)");
1053 1114
1054 AV *av = (AV *)SvRV (tuple); 1115 AV *av = (AV *)SvRV (tuple);
1055 1116
1056 XPUSHs ( 1117 XPUSHs (
1057 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1118 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1058 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1119 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1059 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1120 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1060 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1121 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1061 ? &PL_sv_yes : &PL_sv_undef); 1122 ? &PL_sv_yes : &PL_sv_undef);
1062} 1123}
1063 1124
1064void 1125void
1065ber_is_seq (SV *tuple) 1126ber_is_seq (SV *tuple)
1069 XSRETURN_UNDEF; 1130 XSRETURN_UNDEF;
1070 1131
1071 AV *av = ber_tuple (tuple); 1132 AV *av = ber_tuple (tuple);
1072 1133
1073 XPUSHs ( 1134 XPUSHs (
1074 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1135 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1075 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1136 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1076 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1137 && SvIV (AvARRAY (av)[BER_FLAGS])
1077 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1138 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1078} 1139}
1079 1140
1080void 1141void
1081ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1142ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1082 PPCODE: 1143 PPCODE:
1083{ 1144{
1084 if (!SvOK (tuple)) 1145 if (!SvOK (tuple))
1085 XSRETURN_NO; 1146 XSRETURN_NO;
1086 1147
1087 AV *av = ber_tuple (tuple); 1148 AV *av = ber_tuple (tuple);
1088 1149
1089 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1150 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1090 1151
1091 XPUSHs ( 1152 XPUSHs (
1092 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1153 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1093 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1154 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1094 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1155 && !SvIV (AvARRAY (av)[BER_FLAGS])
1095 && (!SvOK (value) || data == SvIV (value)) 1156 && (!SvOK (value) || data == SvUV (value))
1096 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1157 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1097 : &PL_sv_undef); 1158 : &PL_sv_undef);
1098} 1159}
1099 1160
1100void 1161void
1101ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1162ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
1105 XSRETURN_NO; 1166 XSRETURN_NO;
1106 1167
1107 AV *av = ber_tuple (tuple); 1168 AV *av = ber_tuple (tuple);
1108 1169
1109 XPUSHs ( 1170 XPUSHs (
1110 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1171 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1111 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1172 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1112 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1173 && !SvIV (AvARRAY (av)[BER_FLAGS])
1113 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1174 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1114 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1175 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1115} 1176}
1116 1177
1117############################################################################# 1178#############################################################################
1130 SvCUR_set (buf_sv, cur - buf); 1191 SvCUR_set (buf_sv, cur - buf);
1131 XPUSHs (buf_sv); 1192 XPUSHs (buf_sv);
1132} 1193}
1133 1194
1134SV * 1195SV *
1135ber_i32 (IV iv) 1196ber_int (SV *sv)
1136 CODE: 1197 CODE:
1137{ 1198{
1138 AV *av = newAV (); 1199 AV *av = newAV ();
1139 av_fill (av, BER_ARRAYSIZE - 1); 1200 av_fill (av, BER_ARRAYSIZE - 1);
1140 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1201 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1141 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1202 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1142 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1203 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1143 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1204 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1144 RETVAL = newRV_noinc ((SV *)av); 1205 RETVAL = newRV_noinc ((SV *)av);
1145} 1206}
1146 OUTPUT: RETVAL 1207 OUTPUT: RETVAL
1147 1208
1148# TODO: not arrayref, but elements? 1209# TODO: not arrayref, but elements?
1150ber_seq (SV *arrayref) 1211ber_seq (SV *arrayref)
1151 CODE: 1212 CODE:
1152{ 1213{
1153 AV *av = newAV (); 1214 AV *av = newAV ();
1154 av_fill (av, BER_ARRAYSIZE - 1); 1215 av_fill (av, BER_ARRAYSIZE - 1);
1155 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1216 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1156 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1217 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1157 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1218 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1158 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1219 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1159 RETVAL = newRV_noinc ((SV *)av); 1220 RETVAL = newRV_noinc ((SV *)av);
1160} 1221}
1161 OUTPUT: RETVAL 1222 OUTPUT: RETVAL
1162 1223
1163MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1224MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines