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.7 by root, Sat Apr 20 01:31:07 2019 UTC vs.
Revision 1.21 by root, Sat Apr 20 17:23: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// 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, //X 18 ASN_OID = 0x06,
16 ASN_OBJECT_DESCRIPTOR = 0x07, //X 19 ASN_OBJECT_DESCRIPTOR = 0x07,
17 ASN_EXTERNAL = 0x08, //X 20 ASN_EXTERNAL = 0x08,
18 ASN_REAL = 0x09, //X 21 ASN_REAL = 0x09,
19 ASN_ENUMERATED = 0x0a, //X 22 ASN_ENUMERATED = 0x0a,
20 ASN_EMBEDDED_PDV = 0x0b, //X 23 ASN_EMBEDDED_PDV = 0x0b,
21 ASN_UTF8_STRING = 0x0c, //X 24 ASN_UTF8_STRING = 0x0c,
22 ASN_RELATIVE_OID = 0x0d, //X 25 ASN_RELATIVE_OID = 0x0d,
23 ASN_SEQUENCE = 0x10, 26 ASN_SEQUENCE = 0x10,
24 ASN_SET = 0x11, //X 27 ASN_SET = 0x11,
25 ASN_NUMERIC_STRING = 0x12, //X 28 ASN_NUMERIC_STRING = 0x12,
26 ASN_PRINTABLE_STRING = 0x13, //X 29 ASN_PRINTABLE_STRING = 0x13,
27 ASN_TELETEX_STRING = 0x14, //X 30 ASN_TELETEX_STRING = 0x14,
28 ASN_T61_STRING = 0x14, //X 31 ASN_T61_STRING = 0x14,
29 ASN_VIDEOTEX_STRING = 0x15, //X 32 ASN_VIDEOTEX_STRING = 0x15,
30 ASN_IA5_STRING = 0x16, //X 33 ASN_IA5_STRING = 0x16,
31 ASN_ASCII_STRING = 0x16, //X 34 ASN_ASCII_STRING = 0x16,
32 ASN_UTC_TIME = 0x17, //X 35 ASN_UTC_TIME = 0x17,
33 ASN_GENERALIZED_TIME = 0x18, //X 36 ASN_GENERALIZED_TIME = 0x18,
34 ASN_GRAPHIC_STRING = 0x19, //X 37 ASN_GRAPHIC_STRING = 0x19,
35 ASN_VISIBLE_STRING = 0x1a, //X 38 ASN_VISIBLE_STRING = 0x1a,
36 ASN_ISO646_STRING = 0x1a, //X 39 ASN_ISO646_STRING = 0x1a,
37 ASN_GENERAL_STRING = 0x1b, //X 40 ASN_GENERAL_STRING = 0x1b,
38 ASN_UNIVERSAL_STRING = 0x1c, //X 41 ASN_UNIVERSAL_STRING = 0x1c,
39 ASN_CHARACTER_STRING = 0x1d, //X 42 ASN_CHARACTER_STRING = 0x1d,
40 ASN_BMP_STRING = 0x1e, //X 43 ASN_BMP_STRING = 0x1e,
41 44
42 ASN_TAG_BER = 0x1f, 45 ASN_TAG_BER = 0x1f,
43 ASN_TAG_MASK = 0x1f, 46 ASN_TAG_MASK = 0x1f,
44 47
45 // primitive/constructed 48 // primitive/constructed
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};
77 BER_TYPE_IPADDRESS, 81 BER_TYPE_IPADDRESS,
78 BER_TYPE_CROAK, 82 BER_TYPE_CROAK,
79}; 83};
80 84
81enum { 85enum {
82 BER_CLASS = 0, 86 BER_CLASS = 0,
83 BER_TAG = 1, 87 BER_TAG = 1,
84 BER_CONSTRUCTED = 2, 88 BER_FLAGS = 2,
85 BER_DATA = 3, 89 BER_DATA = 3,
86 BER_ARRAYSIZE 90 BER_ARRAYSIZE
87}; 91};
88 92
89#define MAX_OID_STRLEN 4096 93#define MAX_OID_STRLEN 4096
90 94
91typedef void profile_type; 95typedef void profile_type;
92 96
93static profile_type *cur_profile, *default_profile; 97static profile_type *cur_profile, *default_profile;
94static SV *buf_sv; // encoding buffer 98static SV *buf_sv; // encoding buffer
95static U8 *buf, *cur, *end; // buffer start, current, end 99static U8 *buf, *cur, *end; // buffer start, current, end
100
101#if PERL_VERSION < 18
102# define utf8_to_uvchr_buf(s,e,l) utf8_to_uvchr (s, l)
103#endif
96 104
97#if __GNUC__ >= 3 105#if __GNUC__ >= 3
98# define expect(expr,value) __builtin_expect ((expr), (value)) 106# define expect(expr,value) __builtin_expect ((expr), (value))
99# define INLINE static inline 107# define INLINE static inline
100#else 108#else
155 return BER_TYPE_BYTES; 163 return BER_TYPE_BYTES;
156 164
157 return SvPVX (sv)[idx]; 165 return SvPVX (sv)[idx];
158} 166}
159 167
160static int 168static void
161profile_set (profile_type *profile, int klass, int tag, int type) 169profile_set (profile_type *profile, int klass, int tag, int type)
162{ 170{
163 SV *sv = (SV *)profile; 171 SV *sv = (SV *)profile;
164 U32 idx = (tag << 2) + klass; 172 U32 idx = (tag << 2) + klass;
165 STRLEN oldlen = SvCUR (sv); 173 STRLEN oldlen = SvCUR (sv);
174 182
175 SvPVX (sv)[idx] = type; 183 SvPVX (sv)[idx] = type;
176} 184}
177 185
178static SV * 186static SV *
179profile_new () 187profile_new (void)
180{ 188{
181 SV *sv = newSVpvn ("", 0); 189 SV *sv = newSVpvn ("", 0);
182 190
183 static const struct { 191 static const struct {
184 int klass; 192 int klass;
185 int tag; 193 int tag;
186 int type; 194 int type;
187 } *celem, default_map[] = { 195 } *celem, default_map[] = {
188 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL }, 196 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },
189 { ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT }, 197 { ASN_UNIVERSAL, ASN_INTEGER , BER_TYPE_INT },
190 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL }, 198 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },
191 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID }, 199 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID },
192 { ASN_UNIVERSAL, ASN_OBJECT_DESCRIPTOR, BER_TYPE_OID },
193 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID }, 200 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
194 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL }, 201 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
202 { ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
195 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 }, 203 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },
196 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 }, 204 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },
197 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 }, 205 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },
198 }; 206 };
199 207
200 for (celem = default_map + sizeof (default_map) / sizeof (default_map [0]); celem > default_map; celem--) 208 for (celem = default_map + sizeof (default_map) / sizeof (default_map [0]); celem-- > default_map; )
201 profile_set ((void *)sv, celem->klass, celem->tag, celem->type); 209 profile_set ((profile_type *)sv, celem->klass, celem->tag, celem->type);
202 210
203 return sv_bless (newRV_noinc (sv), profile_stash); 211 return sv_bless (newRV_noinc (sv), profile_stash);
204} 212}
205 213
206///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
241 249
242 return *cur++; 250 return *cur++;
243} 251}
244 252
245// get ber-encoded integer (i.e. pack "w") 253// get ber-encoded integer (i.e. pack "w")
246static U32 254static UV
247get_w (void) 255get_w (void)
248{ 256{
249 U32 res = 0; 257 UV res = 0;
258 U8 c = get_u8 ();
259
260 if (expect_false (c == 0x80))
261 error ("illegal BER padding (X.690 8.1.2.4.2, 8.19.2)");
250 262
251 for (;;) 263 for (;;)
252 { 264 {
253 U8 c = get_u8 ();
254 res = (res << 7) | (c & 0x7f); 265 res = (res << 7) | (c & 0x7f);
255 266
256 if (!(c & 0x80)) 267 if (!(c & 0x80))
257 return res; 268 return res;
258 }
259}
260 269
270 c = get_u8 ();
271 }
272}
273
261static U32 274static UV
262get_length (void) 275get_length (void)
263{ 276{
264 U32 res = get_u8 (); 277 UV res = get_u8 ();
265 278
266 if (res & 0x80) 279 if (res & 0x80)
267 { 280 {
268 int cnt = res & 0x7f; 281 int cnt = res & 0x7f;
269 res = 0; 282 res = 0;
270 283
271 switch (cnt) 284 switch (cnt)
272 { 285 {
273 case 0: 286 case 0:
274 error ("indefinite ASN.1 lengths not supported"); 287 error ("indefinite ASN.1 lengths not supported");
275 return 0; 288
289 case 0x7f:
290 error ("ASN.1 reserved value in length (X.690 8.1.3.5)");
276 291
277 default: 292 default:
278 error ("ASN.1 length too long"); 293 error ("ASN.1 length too long (only up to 2**64 octets supported)");
279 return 0;
280 294
295 case 8: res = (res << 8) | get_u8 ();
296 case 7: res = (res << 8) | get_u8 ();
297 case 6: res = (res << 8) | get_u8 ();
298 case 5: res = (res << 8) | get_u8 ();
281 case 4: res = (res << 8) | get_u8 (); 299 case 4: res = (res << 8) | get_u8 ();
282 case 3: res = (res << 8) | get_u8 (); 300 case 3: res = (res << 8) | get_u8 ();
283 case 2: res = (res << 8) | get_u8 (); 301 case 2: res = (res << 8) | get_u8 ();
284 case 1: res = (res << 8) | get_u8 (); 302 case 1: res = (res << 8) | get_u8 ();
285 } 303 }
287 305
288 return res; 306 return res;
289} 307}
290 308
291static SV * 309static SV *
292decode_int () 310decode_int (void)
293{ 311{
294 int len = get_length (); 312 UV len = get_length ();
295 313
296 if (len <= 0) 314 if (!len)
297 {
298 error ("integer length equal to zero"); 315 error ("invalid integer length equal to zero (X.690 8.3.1)");
299 return 0;
300 }
301 316
302 U8 *data = get_n (len); 317 U8 *data = get_n (len);
318
319 if (expect_false (len > 1))
320 {
321 U16 mask = (data [0] << 8) | data [1] & 0xff80;
322
323 if (expect_false (mask == 0xff80 || mask == 0x0000))
324 error ("illegal padding in integer (X.690 8.3.2)");
325 }
303 326
304 int negative = data [0] & 0x80; 327 int negative = data [0] & 0x80;
305 328
306 UV val = negative ? -1 : 0; // copy signbit to all bits 329 UV val = negative ? -1 : 0; // copy signbit to all bits
307 330
315} 338}
316 339
317static SV * 340static SV *
318decode_data (void) 341decode_data (void)
319{ 342{
320 U32 len = get_length (); 343 UV len = get_length ();
321 U8 *data = get_n (len);
322 return newSVpvn ((char *)data, len); 344 return newSVpvn ((char *)get_n (len), len);
323} 345}
324 346
325// gelper for decode_object_identifier 347// helper for decode_object_identifier
326static char * 348static char *
327write_uv (char *buf, U32 u) 349write_uv (char *buf, UV u)
328{ 350{
329 // 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)
330 if (expect_true (u < 10)) 352 if (expect_true (u < 10))
331 *buf++ = u + '0'; 353 *buf++ = u + '0';
332 else 354 else
333 { 355 {
356 // this *could* be done much faster using branchless fixed-point arithmetics
334 char *beg = buf; 357 char *beg = buf;
335 358
336 do 359 do
337 { 360 {
338 *buf++ = u % 10 + '0'; 361 *buf++ = u % 10 + '0';
339 u /= 10; 362 u /= 10;
340 } 363 }
341 while (u); 364 while (u);
342 365
343 // reverse digits 366 // reverse digits
344 for (char *ptr = buf; --ptr != beg; ++beg) 367 char *ptr = buf;
368 while (--ptr > beg)
345 { 369 {
346 char c = *ptr; 370 char c = *ptr;
347 *ptr = *beg; 371 *ptr = *beg;
348 *beg = c; 372 *beg = c;
373 ++beg;
349 } 374 }
350 } 375 }
351 376
352 return buf; 377 return buf;
353} 378}
354 379
355static SV * 380static SV *
356decode_oid (int relative) 381decode_oid (int relative)
357{ 382{
358 U32 len = get_length (); 383 UV len = get_length ();
359 384
360 if (len <= 0) 385 if (len <= 0)
361 { 386 {
362 error ("OBJECT IDENTIFIER length equal to zero"); 387 error ("OBJECT IDENTIFIER length equal to zero");
363 return &PL_sv_undef; 388 return &PL_sv_undef;
364 } 389 }
365 390
366 U8 *end = cur + len; 391 U8 *end = cur + len;
367 U32 w = get_w (); 392 UV w = get_w ();
368 393
369 static char oid[MAX_OID_STRLEN]; // must be static 394 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack
370 char *app = oid; 395 char *app = oid;
371 396
372 if (relative) 397 if (relative)
373 app = write_uv (app, w); 398 app = write_uv (app, w);
374 else 399 else if (w < 2 * 40)
375 { 400 {
376 app = write_uv (app, (U8)w / 40); 401 app = write_uv (app, (U8)w / 40);
377 *app++ = '.'; 402 *app++ = '.';
378 app = write_uv (app, (U8)w % 40); 403 app = write_uv (app, (U8)w % 40);
379 } 404 }
405 else
406 {
407 app = write_uv (app, 2);
408 *app++ = '.';
409 app = write_uv (app, w - 2 * 40);
410 }
380 411
412 while (cur < end)
413 {
381 // we assume an oid component is never > 64 bytes 414 // we assume an oid component is never > 64 digits
382 while (cur < end && oid + sizeof (oid) - app > 64) 415 if (oid + sizeof (oid) - app < 64)
383 { 416 croak ("BER_TYPE_OID to long to decode");
417
384 w = get_w (); 418 w = get_w ();
385 *app++ = '.'; 419 *app++ = '.';
386 app = write_uv (app, w); 420 app = write_uv (app, w);
387 } 421 }
388 422
393static SV * 427static SV *
394decode_ucs (int chrsize) 428decode_ucs (int chrsize)
395{ 429{
396 SV *res = NEWSV (0, 0); 430 SV *res = NEWSV (0, 0);
397 431
398 U32 len = get_length (); 432 UV len = get_length ();
399 433
400 if (len & (chrsize - 1)) 434 if (len & (chrsize - 1))
401 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len); 435 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
402 436
403 while (len) 437 while (len)
424 458
425 return res; 459 return res;
426} 460}
427 461
428static SV * 462static SV *
429decode_ber () 463decode_ber (void)
430{ 464{
431 int identifier = get_u8 (); 465 int identifier = get_u8 ();
432 466
433 SV *res; 467 SV *res;
434 468
437 int tag = identifier & ASN_TAG_MASK; 471 int tag = identifier & ASN_TAG_MASK;
438 472
439 if (tag == ASN_TAG_BER) 473 if (tag == ASN_TAG_BER)
440 tag = get_w (); 474 tag = get_w ();
441 475
442 if (tag == ASN_TAG_BER)
443 tag = get_w ();
444
445 if (constructed) 476 if (constructed)
446 { 477 {
447 U32 len = get_length (); 478 UV len = get_length ();
448 U32 seqend = (cur - buf) + len; 479 UV seqend = (cur - buf) + len;
449 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 480 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
450 481
451 while (cur < buf + seqend) 482 while (cur < buf + seqend)
452 av_push (av, decode_ber ()); 483 av_push (av, decode_ber ());
453 484
454 if (cur > buf + seqend) 485 if (cur > buf + seqend)
455 croak ("constructed type %02x overflow (%x %x)\n", identifier, cur - buf, seqend); 486 croak ("constructed type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
456 487
457 res = newRV_inc ((SV *)av); 488 res = newRV_inc ((SV *)av);
458 } 489 }
459 else 490 else
460 switch (profile_lookup (cur_profile, klass, tag)) 491 switch (profile_lookup (cur_profile, klass, tag))
461 { 492 {
462 case BER_TYPE_NULL: 493 case BER_TYPE_NULL:
494 {
495 UV len = get_length ();
496
497 if (len)
498 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
499
463 res = &PL_sv_undef; 500 res = &PL_sv_undef;
501 }
464 break; 502 break;
465 503
466 case BER_TYPE_BOOL: 504 case BER_TYPE_BOOL:
467 { 505 {
468 U32 len = get_length (); 506 UV len = get_length ();
469 507
470 if (len != 1) 508 if (len != 1)
471 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len); 509 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
472 510
473 res = newSVcacheint (get_u8 () ? 0 : 1); 511 res = newSVcacheint (!!get_u8 ());
474 } 512 }
475 break; 513 break;
476 514
477 case BER_TYPE_OID: 515 case BER_TYPE_OID:
478 res = decode_oid (0); 516 res = decode_oid (0);
495 res = decode_data (); 533 res = decode_data ();
496 break; 534 break;
497 535
498 case BER_TYPE_IPADDRESS: 536 case BER_TYPE_IPADDRESS:
499 { 537 {
500 U32 len = get_length (); 538 UV len = get_length ();
501 539
502 if (len != 4) 540 if (len != 4)
503 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 541 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
504 542
505 U8 c1 = get_u8 (); 543 U8 c1 = get_u8 ();
506 U8 c2 = get_u8 (); 544 U8 c2 = get_u8 ();
507 U8 c3 = get_u8 (); 545 U8 c3 = get_u8 ();
508 U8 c4 = get_u8 (); 546 U8 c4 = get_u8 ();
525 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 563 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
526 } 564 }
527 565
528 AV *av = newAV (); 566 AV *av = newAV ();
529 av_fill (av, BER_ARRAYSIZE - 1); 567 av_fill (av, BER_ARRAYSIZE - 1);
530 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 568 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
531 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 569 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
532 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 570 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
533 AvARRAY (av)[BER_DATA ] = res; 571 AvARRAY (av)[BER_DATA ] = res;
534 572
535 return newRV_noinc ((SV *)av); 573 return newRV_noinc ((SV *)av);
536} 574}
537 575
538///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
543strlen_sum (STRLEN l1, STRLEN l2) 581strlen_sum (STRLEN l1, STRLEN l2)
544{ 582{
545 size_t sum = l1 + l2; 583 size_t sum = l1 + l2;
546 584
547 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 585 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
548 croak ("JSON::XS: string size overflow"); 586 croak ("Convert::BER::XS: string size overflow");
549 587
550 return sum; 588 return sum;
551} 589}
552 590
553static void 591static void
554set_buf (SV *sv) 592set_buf (SV *sv)
555{ 593{
556 STRLEN len; 594 STRLEN len;
557 buf_sv = sv; 595 buf_sv = sv;
558 buf = SvPVbyte (buf_sv, len); 596 buf = (U8 *)SvPVbyte (buf_sv, len);
559 cur = buf; 597 cur = buf;
560 end = buf + len; 598 end = buf + len;
561} 599}
562 600
563/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */ 601/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
577need (STRLEN len) 615need (STRLEN len)
578{ 616{
579 if (expect_false ((uintptr_t)(end - cur) < len)) 617 if (expect_false ((uintptr_t)(end - cur) < len))
580 { 618 {
581 STRLEN pos = cur - buf; 619 STRLEN pos = cur - buf;
582 buf = my_sv_grow (buf_sv, pos, len); 620 buf = (U8 *)my_sv_grow (buf_sv, pos, len);
583 cur = buf + pos; 621 cur = buf + pos;
584 end = buf + SvLEN (buf_sv) - 1; 622 end = buf + SvLEN (buf_sv) - 1;
585 } 623 }
586} 624}
587 625
591 need (1); 629 need (1);
592 *cur++ = val; 630 *cur++ = val;
593} 631}
594 632
595static void 633static void
596put_w_nocheck (U32 val) 634put_w_nocheck (UV val)
597{ 635{
636#if UVSIZE > 4
637 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
638 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
639 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
640 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
641 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
642#endif
598 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 643 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
599 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 644 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
600 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 645 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
601 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 646 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
602 *cur = val & 0x7f; cur += 1; 647 *cur = val & 0x7f; cur += 1;
603} 648}
604 649
605static void 650static void
606put_w (U32 val) 651put_w (UV val)
607{ 652{
608 need (5); // we only handle up to 5 bytes 653 need (5); // we only handle up to 5 bytes
609 654
610 put_w_nocheck (val); 655 put_w_nocheck (val);
611} 656}
612 657
613static U8 * 658static U8 *
614put_length_at (U32 val, U8 *cur) 659put_length_at (UV val, U8 *cur)
615{ 660{
616 if (val < 0x7fU) 661 if (val < 0x7fU)
617 *cur++ = val; 662 *cur++ = val;
618 else 663 else
619 { 664 {
620 U8 *lenb = cur++; 665 U8 *lenb = cur++;
621 666
667#if UVSIZE > 4
668 *cur = val >> 56; cur += *cur > 0;
669 *cur = val >> 48; cur += *cur > 0;
670 *cur = val >> 40; cur += *cur > 0;
671 *cur = val >> 32; cur += *cur > 0;
672#endif
622 *cur = val >> 24; cur += *cur > 0; 673 *cur = val >> 24; cur += *cur > 0;
623 *cur = val >> 16; cur += *cur > 0; 674 *cur = val >> 16; cur += *cur > 0;
624 *cur = val >> 8; cur += *cur > 0; 675 *cur = val >> 8; cur += *cur > 0;
625 *cur = val ; cur += 1; 676 *cur = val ; cur += 1;
626 677
629 680
630 return cur; 681 return cur;
631} 682}
632 683
633static void 684static void
634put_length (U32 val) 685put_length (UV val)
635{ 686{
636 need (5 + val); 687 need (5 + val);
637 cur = put_length_at (val, cur); 688 cur = put_length_at (val, cur);
638} 689}
639 690
640// return how many bytes the encoded length requires 691// return how many bytes the encoded length requires
641static int length_length (U32 val) 692static int length_length (UV val)
642{ 693{
643 return val < 0x7fU 694 return val < 0x7fU
644 ? 1 695 ? 1
645 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 696 : 2
697 + (val > 0xffU)
698 + (val > 0xffffU)
699 + (val > 0xffffffU)
700#if UVSIZE > 4
701 + (val > 0xffffffffU)
702 + (val > 0xffffffffffU)
703 + (val > 0xffffffffffffU)
704 + (val > 0xffffffffffffffU)
705#endif
706 ;
646} 707}
647 708
648static void 709static void
649encode_data (const char *ptr, STRLEN len) 710encode_data (const char *ptr, STRLEN len)
650{ 711{
712 773
713 *lenb = cur - lenb - 1; 774 *lenb = cur - lenb - 1;
714} 775}
715 776
716// we don't know the length yet, so we optimistically 777// we don't know the length yet, so we optimistically
717// assume the length will need one octet later. if that 778// assume the length will need one octet later. If that
718// turns out to be wrong, we memove as needed. 779// turns out to be wrong, we memmove as needed.
719// mark the beginning 780// mark the beginning
720static STRLEN 781static STRLEN
721len_fixup_mark () 782len_fixup_mark (void)
722{ 783{
723 return cur++ - buf; 784 return cur++ - buf;
724} 785}
725 786
726// patch up the length 787// patch up the length
813 put_length (uchars * chrsize); 874 put_length (uchars * chrsize);
814 875
815 while (uchars--) 876 while (uchars--)
816 { 877 {
817 STRLEN uclen; 878 STRLEN uclen;
818 UV uchr = utf8_to_uvchr_buf (ptr, ptr + len, &uclen); 879 UV uchr = utf8_to_uvchr_buf ((U8 *)ptr, (U8 *)ptr + len, &uclen);
819 880
820 ptr += uclen; 881 ptr += uclen;
821 len -= uclen; 882 len -= uclen;
822 883
823 if (chrsize == 4) 884 if (chrsize == 4)
835{ 896{
836 AV *av = ber_tuple (tuple); 897 AV *av = ber_tuple (tuple);
837 898
838 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 899 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
839 int tag = SvIV (AvARRAY (av)[BER_TAG]); 900 int tag = SvIV (AvARRAY (av)[BER_TAG]);
840 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 901 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
841 SV *data = AvARRAY (av)[BER_DATA]; 902 SV *data = AvARRAY (av)[BER_DATA];
842 903
843 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 904 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
844 905
845 if (expect_false (tag >= ASN_TAG_BER)) 906 if (expect_false (tag >= ASN_TAG_BER))
864 int fill = AvFILL (av); 925 int fill = AvFILL (av);
865 926
866 if (expect_false (SvRMAGICAL (av))) 927 if (expect_false (SvRMAGICAL (av)))
867 croak ("BER constructed data must not be tied"); 928 croak ("BER constructed data must not be tied");
868 929
930 int i;
869 for (int i = 0; i <= fill; ++i) 931 for (i = 0; i <= fill; ++i)
870 encode_ber (AvARRAY (av)[i]); 932 encode_ber (AvARRAY (av)[i]);
871 933
872 len_fixup (mark); 934 len_fixup (mark);
873 } 935 }
874 else 936 else
878 put_length (0); 940 put_length (0);
879 break; 941 break;
880 942
881 case BER_TYPE_BOOL: 943 case BER_TYPE_BOOL:
882 put_length (1); 944 put_length (1);
883 *cur++ = SvTRUE (data) ? 0xff : 0x00; 945 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
884 break; 946 break;
885 947
886 case BER_TYPE_OID: 948 case BER_TYPE_OID:
887 encode_oid (data, 0); 949 encode_oid (data, 0);
888 break; 950 break;
951 const char *name; 1013 const char *name;
952 IV iv; 1014 IV iv;
953 } *civ, const_iv[] = { 1015 } *civ, const_iv[] = {
954#define const_iv(name) { # name, name }, 1016#define const_iv(name) { # name, name },
955 const_iv (ASN_BOOLEAN) 1017 const_iv (ASN_BOOLEAN)
956 const_iv (ASN_INTEGER32) 1018 const_iv (ASN_INTEGER)
957 const_iv (ASN_BIT_STRING) 1019 const_iv (ASN_BIT_STRING)
958 const_iv (ASN_OCTET_STRING) 1020 const_iv (ASN_OCTET_STRING)
959 const_iv (ASN_NULL) 1021 const_iv (ASN_NULL)
960 const_iv (ASN_OBJECT_IDENTIFIER) 1022 const_iv (ASN_OBJECT_IDENTIFIER)
961 const_iv (ASN_OBJECT_DESCRIPTOR) 1023 const_iv (ASN_OBJECT_DESCRIPTOR)
990 const_iv (ASN_CONTEXT) 1052 const_iv (ASN_CONTEXT)
991 const_iv (ASN_PRIVATE) 1053 const_iv (ASN_PRIVATE)
992 1054
993 const_iv (BER_CLASS) 1055 const_iv (BER_CLASS)
994 const_iv (BER_TAG) 1056 const_iv (BER_TAG)
995 const_iv (BER_CONSTRUCTED) 1057 const_iv (BER_FLAGS)
996 const_iv (BER_DATA) 1058 const_iv (BER_DATA)
997 1059
998 const_iv (BER_TYPE_BYTES) 1060 const_iv (BER_TYPE_BYTES)
999 const_iv (BER_TYPE_UTF8) 1061 const_iv (BER_TYPE_UTF8)
1000 const_iv (BER_TYPE_UCS2) 1062 const_iv (BER_TYPE_UCS2)
1008 const_iv (BER_TYPE_IPADDRESS) 1070 const_iv (BER_TYPE_IPADDRESS)
1009 const_iv (BER_TYPE_CROAK) 1071 const_iv (BER_TYPE_CROAK)
1010 1072
1011 const_iv (SNMP_IPADDRESS) 1073 const_iv (SNMP_IPADDRESS)
1012 const_iv (SNMP_COUNTER32) 1074 const_iv (SNMP_COUNTER32)
1075 const_iv (SNMP_GAUGE32)
1013 const_iv (SNMP_UNSIGNED32) 1076 const_iv (SNMP_UNSIGNED32)
1014 const_iv (SNMP_TIMETICKS) 1077 const_iv (SNMP_TIMETICKS)
1015 const_iv (SNMP_OPAQUE) 1078 const_iv (SNMP_OPAQUE)
1016 const_iv (SNMP_COUNTER64) 1079 const_iv (SNMP_COUNTER64)
1017 }; 1080 };
1024ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1087ber_decode (SV *ber, SV *profile = &PL_sv_undef)
1025 CODE: 1088 CODE:
1026{ 1089{
1027 cur_profile = SvPROFILE (profile); 1090 cur_profile = SvPROFILE (profile);
1028 STRLEN len; 1091 STRLEN len;
1029 buf = SvPVbyte (ber, len); 1092 buf = (U8 *)SvPVbyte (ber, len);
1030 cur = buf; 1093 cur = buf;
1031 end = buf + len; 1094 end = buf + len;
1032 1095
1033 RETVAL = decode_ber (); 1096 RETVAL = decode_ber ();
1034} 1097}
1035 OUTPUT: RETVAL 1098 OUTPUT: RETVAL
1036 1099
1037void 1100void
1038ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &PL_sv_undef, SV *data = &PL_sv_undef) 1101ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *flags = &PL_sv_undef, SV *data = &PL_sv_undef)
1039 PPCODE: 1102 PPCODE:
1040{ 1103{
1041 if (!SvOK (tuple)) 1104 if (!SvOK (tuple))
1042 XSRETURN_NO; 1105 XSRETURN_NO;
1043 1106
1045 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1108 croak ("ber_is: tuple must be BER tuple (array-ref)");
1046 1109
1047 AV *av = (AV *)SvRV (tuple); 1110 AV *av = (AV *)SvRV (tuple);
1048 1111
1049 XPUSHs ( 1112 XPUSHs (
1050 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1113 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1051 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1114 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1052 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1115 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1053 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1116 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1054 ? &PL_sv_yes : &PL_sv_undef); 1117 ? &PL_sv_yes : &PL_sv_undef);
1055} 1118}
1056 1119
1057void 1120void
1058ber_is_seq (SV *tuple) 1121ber_is_seq (SV *tuple)
1062 XSRETURN_UNDEF; 1125 XSRETURN_UNDEF;
1063 1126
1064 AV *av = ber_tuple (tuple); 1127 AV *av = ber_tuple (tuple);
1065 1128
1066 XPUSHs ( 1129 XPUSHs (
1067 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1130 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1068 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1131 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1069 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1132 && SvIV (AvARRAY (av)[BER_FLAGS])
1070 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1133 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1071} 1134}
1072 1135
1073void 1136void
1074ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1137ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1075 PPCODE: 1138 PPCODE:
1076{ 1139{
1077 if (!SvOK (tuple)) 1140 if (!SvOK (tuple))
1078 XSRETURN_NO; 1141 XSRETURN_NO;
1079 1142
1080 AV *av = ber_tuple (tuple); 1143 AV *av = ber_tuple (tuple);
1081 1144
1082 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1145 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1083 1146
1084 XPUSHs ( 1147 XPUSHs (
1085 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1148 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1086 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1149 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1087 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1150 && !SvIV (AvARRAY (av)[BER_FLAGS])
1088 && (!SvOK (value) || data == SvIV (value)) 1151 && (!SvOK (value) || data == SvUV (value))
1089 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1152 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1090 : &PL_sv_undef); 1153 : &PL_sv_undef);
1091} 1154}
1092 1155
1093void 1156void
1094ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1157ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
1098 XSRETURN_NO; 1161 XSRETURN_NO;
1099 1162
1100 AV *av = ber_tuple (tuple); 1163 AV *av = ber_tuple (tuple);
1101 1164
1102 XPUSHs ( 1165 XPUSHs (
1103 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1166 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1104 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1167 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1105 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1168 && !SvIV (AvARRAY (av)[BER_FLAGS])
1106 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1169 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1107 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1170 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1108} 1171}
1109 1172
1110############################################################################# 1173#############################################################################
1123 SvCUR_set (buf_sv, cur - buf); 1186 SvCUR_set (buf_sv, cur - buf);
1124 XPUSHs (buf_sv); 1187 XPUSHs (buf_sv);
1125} 1188}
1126 1189
1127SV * 1190SV *
1128ber_i32 (IV iv) 1191ber_int (SV *sv)
1129 CODE: 1192 CODE:
1130{ 1193{
1131 AV *av = newAV (); 1194 AV *av = newAV ();
1132 av_fill (av, BER_ARRAYSIZE - 1); 1195 av_fill (av, BER_ARRAYSIZE - 1);
1133 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1196 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1134 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1197 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1135 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1198 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1136 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1199 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1137 RETVAL = newRV_noinc ((SV *)av); 1200 RETVAL = newRV_noinc ((SV *)av);
1138} 1201}
1139 OUTPUT: RETVAL 1202 OUTPUT: RETVAL
1140 1203
1141# TODO: not arrayref, but elements? 1204# TODO: not arrayref, but elements?
1143ber_seq (SV *arrayref) 1206ber_seq (SV *arrayref)
1144 CODE: 1207 CODE:
1145{ 1208{
1146 AV *av = newAV (); 1209 AV *av = newAV ();
1147 av_fill (av, BER_ARRAYSIZE - 1); 1210 av_fill (av, BER_ARRAYSIZE - 1);
1148 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1211 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1149 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1212 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1150 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1213 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1151 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1214 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1152 RETVAL = newRV_noinc ((SV *)av); 1215 RETVAL = newRV_noinc ((SV *)av);
1153} 1216}
1154 OUTPUT: RETVAL 1217 OUTPUT: RETVAL
1155 1218
1156MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1219MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines