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.6 by root, Sat Apr 20 01:03:59 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
389 return newSVpvn (oid, app - oid); 423 return newSVpvn (oid, app - oid);
390} 424}
391 425
426// TODO: this is unacceptably slow
392static SV * 427static SV *
428decode_ucs (int chrsize)
429{
430 SV *res = NEWSV (0, 0);
431
432 UV len = get_length ();
433
434 if (len & (chrsize - 1))
435 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
436
437 while (len)
438 {
439 U8 b1 = get_u8 ();
440 U8 b2 = get_u8 ();
441 U32 chr = (b1 << 8) | b2;
442
443 if (chrsize == 4)
444 {
445 U8 b3 = get_u8 ();
446 U8 b4 = get_u8 ();
447 chr = (chr << 16) | (b3 << 8) | b4;
448 }
449
450 U8 uchr [UTF8_MAXBYTES];
451 int uclen = uvuni_to_utf8 (uchr, chr) - uchr;
452
453 sv_catpvn (res, (const char *)uchr, uclen);
454 len -= chrsize;
455 }
456
457 SvUTF8_on (res);
458
459 return res;
460}
461
462static SV *
393decode_ber () 463decode_ber (void)
394{ 464{
395 int identifier = get_u8 (); 465 int identifier = get_u8 ();
396 466
397 SV *res; 467 SV *res;
398 468
401 int tag = identifier & ASN_TAG_MASK; 471 int tag = identifier & ASN_TAG_MASK;
402 472
403 if (tag == ASN_TAG_BER) 473 if (tag == ASN_TAG_BER)
404 tag = get_w (); 474 tag = get_w ();
405 475
406 if (tag == ASN_TAG_BER)
407 tag = get_w ();
408
409 if (constructed) 476 if (constructed)
410 { 477 {
411 U32 len = get_length (); 478 UV len = get_length ();
412 U32 seqend = (cur - buf) + len; 479 UV seqend = (cur - buf) + len;
413 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 480 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
414 481
415 while (cur < buf + seqend) 482 while (cur < buf + seqend)
416 av_push (av, decode_ber ()); 483 av_push (av, decode_ber ());
417 484
418 if (cur > buf + seqend) 485 if (cur > buf + seqend)
419 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);
420 487
421 res = newRV_inc ((SV *)av); 488 res = newRV_inc ((SV *)av);
422 } 489 }
423 else 490 else
424 switch (profile_lookup (cur_profile, klass, tag)) 491 switch (profile_lookup (cur_profile, klass, tag))
425 { 492 {
426 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
427 res = &PL_sv_undef; 500 res = &PL_sv_undef;
501 }
428 break; 502 break;
429 503
430 case BER_TYPE_BOOL: 504 case BER_TYPE_BOOL:
431 { 505 {
432 U32 len = get_length (); 506 UV len = get_length ();
433 507
434 if (len != 1) 508 if (len != 1)
435 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);
436 510
437 res = newSVcacheint (get_u8 () ? 0 : 1); 511 res = newSVcacheint (!!get_u8 ());
438 } 512 }
439 break; 513 break;
440 514
441 case BER_TYPE_OID: 515 case BER_TYPE_OID:
442 res = decode_oid (0); 516 res = decode_oid (0);
459 res = decode_data (); 533 res = decode_data ();
460 break; 534 break;
461 535
462 case BER_TYPE_IPADDRESS: 536 case BER_TYPE_IPADDRESS:
463 { 537 {
464 U32 len = get_length (); 538 UV len = get_length ();
465 539
466 if (len != 4) 540 if (len != 4)
467 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);
468 542
469 U8 c1 = get_u8 (); 543 U8 c1 = get_u8 ();
470 U8 c2 = get_u8 (); 544 U8 c2 = get_u8 ();
471 U8 c3 = get_u8 (); 545 U8 c3 = get_u8 ();
472 U8 c4 = get_u8 (); 546 U8 c4 = get_u8 ();
473 547
474 res = newSVpvf ("%d.%d.%d.%d", c1, c2, c3, c4); 548 res = newSVpvf ("%d.%d.%d.%d", c1, c2, c3, c4);
475 } 549 }
476 break; 550 break;
477 551
552 case BER_TYPE_UCS2:
553 res = decode_ucs (2);
554 break;
555
556 case BER_TYPE_UCS4:
557 res = decode_ucs (4);
558 break;
559
478 case BER_TYPE_REAL: 560 case BER_TYPE_REAL:
479 case BER_TYPE_UCS2:
480 case BER_TYPE_UCS4:
481 case BER_TYPE_CROAK: 561 case BER_TYPE_CROAK:
482 default: 562 default:
483 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 563 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
484 } 564 }
485 565
486 AV *av = newAV (); 566 AV *av = newAV ();
487 av_fill (av, BER_ARRAYSIZE - 1); 567 av_fill (av, BER_ARRAYSIZE - 1);
488 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 568 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
489 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 569 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
490 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 570 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
491 AvARRAY (av)[BER_DATA ] = res; 571 AvARRAY (av)[BER_DATA ] = res;
492 572
493 return newRV_noinc ((SV *)av); 573 return newRV_noinc ((SV *)av);
494} 574}
495 575
496///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
501strlen_sum (STRLEN l1, STRLEN l2) 581strlen_sum (STRLEN l1, STRLEN l2)
502{ 582{
503 size_t sum = l1 + l2; 583 size_t sum = l1 + l2;
504 584
505 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 585 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
506 croak ("JSON::XS: string size overflow"); 586 croak ("Convert::BER::XS: string size overflow");
507 587
508 return sum; 588 return sum;
509} 589}
510 590
511static void 591static void
512set_buf (SV *sv) 592set_buf (SV *sv)
513{ 593{
514 STRLEN len; 594 STRLEN len;
515 buf_sv = sv; 595 buf_sv = sv;
516 buf = SvPVbyte (buf_sv, len); 596 buf = (U8 *)SvPVbyte (buf_sv, len);
517 cur = buf; 597 cur = buf;
518 end = buf + len; 598 end = buf + len;
519} 599}
520 600
521/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */ 601/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
535need (STRLEN len) 615need (STRLEN len)
536{ 616{
537 if (expect_false ((uintptr_t)(end - cur) < len)) 617 if (expect_false ((uintptr_t)(end - cur) < len))
538 { 618 {
539 STRLEN pos = cur - buf; 619 STRLEN pos = cur - buf;
540 buf = my_sv_grow (buf_sv, pos, len); 620 buf = (U8 *)my_sv_grow (buf_sv, pos, len);
541 cur = buf + pos; 621 cur = buf + pos;
542 end = buf + SvLEN (buf_sv) - 1; 622 end = buf + SvLEN (buf_sv) - 1;
543 } 623 }
544} 624}
545 625
549 need (1); 629 need (1);
550 *cur++ = val; 630 *cur++ = val;
551} 631}
552 632
553static void 633static void
554put_w_nocheck (U32 val) 634put_w_nocheck (UV val)
555{ 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
556 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 643 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
557 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 644 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
558 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 645 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
559 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 646 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
560 *cur = val & 0x7f; cur += 1; 647 *cur = val & 0x7f; cur += 1;
561} 648}
562 649
563static void 650static void
564put_w (U32 val) 651put_w (UV val)
565{ 652{
566 need (5); // we only handle up to 5 bytes 653 need (5); // we only handle up to 5 bytes
567 654
568 put_w_nocheck (val); 655 put_w_nocheck (val);
569} 656}
570 657
571static U8 * 658static U8 *
572put_length_at (U32 val, U8 *cur) 659put_length_at (UV val, U8 *cur)
573{ 660{
574 if (val < 0x7fU) 661 if (val < 0x7fU)
575 *cur++ = val; 662 *cur++ = val;
576 else 663 else
577 { 664 {
578 U8 *lenb = cur++; 665 U8 *lenb = cur++;
579 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
580 *cur = val >> 24; cur += *cur > 0; 673 *cur = val >> 24; cur += *cur > 0;
581 *cur = val >> 16; cur += *cur > 0; 674 *cur = val >> 16; cur += *cur > 0;
582 *cur = val >> 8; cur += *cur > 0; 675 *cur = val >> 8; cur += *cur > 0;
583 *cur = val ; cur += 1; 676 *cur = val ; cur += 1;
584 677
587 680
588 return cur; 681 return cur;
589} 682}
590 683
591static void 684static void
592put_length (U32 val) 685put_length (UV val)
593{ 686{
594 need (5); 687 need (5 + val);
595 cur = put_length_at (val, cur); 688 cur = put_length_at (val, cur);
596} 689}
597 690
598// return how many bytes the encoded length requires 691// return how many bytes the encoded length requires
599static int length_length (U32 val) 692static int length_length (UV val)
600{ 693{
601 return val < 0x7fU 694 return val < 0x7fU
602 ? 1 695 ? 1
603 : 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 ;
604} 707}
605 708
606static void 709static void
607encode_data (const char *ptr, STRLEN len) 710encode_data (const char *ptr, STRLEN len)
608{ 711{
609 put_length (len); 712 put_length (len);
610 need (len);
611 memcpy (cur, ptr, len); 713 memcpy (cur, ptr, len);
612 cur += len; 714 cur += len;
613} 715}
614 716
615static void 717static void
671 773
672 *lenb = cur - lenb - 1; 774 *lenb = cur - lenb - 1;
673} 775}
674 776
675// we don't know the length yet, so we optimistically 777// we don't know the length yet, so we optimistically
676// assume the length will need one octet later. if that 778// assume the length will need one octet later. If that
677// turns out to be wrong, we memove as needed. 779// turns out to be wrong, we memmove as needed.
678// mark the beginning 780// mark the beginning
679static STRLEN 781static STRLEN
680len_fixup_mark () 782len_fixup_mark (void)
681{ 783{
682 return cur++ - buf; 784 return cur++ - buf;
683} 785}
684 786
685// patch up the length 787// patch up the length
761 863
762 return (AV *)rv; 864 return (AV *)rv;
763} 865}
764 866
765static void 867static void
868encode_ucs (SV *data, int chrsize)
869{
870 STRLEN uchars = sv_len_utf8 (data);
871 STRLEN len;;
872 char *ptr = SvPVutf8 (data, len);
873
874 put_length (uchars * chrsize);
875
876 while (uchars--)
877 {
878 STRLEN uclen;
879 UV uchr = utf8_to_uvchr_buf ((U8 *)ptr, (U8 *)ptr + len, &uclen);
880
881 ptr += uclen;
882 len -= uclen;
883
884 if (chrsize == 4)
885 {
886 *cur++ = uchr >> 24;
887 *cur++ = uchr >> 16;
888 }
889
890 *cur++ = uchr >> 8;
891 *cur++ = uchr;
892 }
893}
894static void
766encode_ber (SV *tuple) 895encode_ber (SV *tuple)
767{ 896{
768 AV *av = ber_tuple (tuple); 897 AV *av = ber_tuple (tuple);
769 898
770 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 899 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
771 int tag = SvIV (AvARRAY (av)[BER_TAG]); 900 int tag = SvIV (AvARRAY (av)[BER_TAG]);
772 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 901 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
773 SV *data = AvARRAY (av)[BER_DATA]; 902 SV *data = AvARRAY (av)[BER_DATA];
774 903
775 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 904 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
776 905
777 if (expect_false (tag >= ASN_TAG_BER)) 906 if (expect_false (tag >= ASN_TAG_BER))
796 int fill = AvFILL (av); 925 int fill = AvFILL (av);
797 926
798 if (expect_false (SvRMAGICAL (av))) 927 if (expect_false (SvRMAGICAL (av)))
799 croak ("BER constructed data must not be tied"); 928 croak ("BER constructed data must not be tied");
800 929
930 int i;
801 for (int i = 0; i <= fill; ++i) 931 for (i = 0; i <= fill; ++i)
802 encode_ber (AvARRAY (av)[i]); 932 encode_ber (AvARRAY (av)[i]);
803 933
804 len_fixup (mark); 934 len_fixup (mark);
805 } 935 }
806 else 936 else
810 put_length (0); 940 put_length (0);
811 break; 941 break;
812 942
813 case BER_TYPE_BOOL: 943 case BER_TYPE_BOOL:
814 put_length (1); 944 put_length (1);
815 put_u8 (SvTRUE (data) ? 0xff : 0x00); 945 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
816 break; 946 break;
817 947
818 case BER_TYPE_OID: 948 case BER_TYPE_OID:
819 encode_oid (data, 0); 949 encode_oid (data, 0);
820 break; 950 break;
849 sscanf (SvPV_nolen (data), "%hhu.%hhu.%hhu.%hhu", ip + 0, ip + 1, ip + 2, ip + 3); 979 sscanf (SvPV_nolen (data), "%hhu.%hhu.%hhu.%hhu", ip + 0, ip + 1, ip + 2, ip + 3);
850 encode_data ((const char *)ip, sizeof (ip)); 980 encode_data ((const char *)ip, sizeof (ip));
851 } 981 }
852 break; 982 break;
853 983
984 case BER_TYPE_UCS2:
985 encode_ucs (data, 2);
986 break;
987
988 case BER_TYPE_UCS4:
989 encode_ucs (data, 4);
990 break;
991
854 case BER_TYPE_REAL: 992 case BER_TYPE_REAL:
855 case BER_TYPE_UCS2:
856 case BER_TYPE_UCS4:
857 case BER_TYPE_CROAK: 993 case BER_TYPE_CROAK:
858 default: 994 default:
859 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 995 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
860 } 996 }
861 997
877 const char *name; 1013 const char *name;
878 IV iv; 1014 IV iv;
879 } *civ, const_iv[] = { 1015 } *civ, const_iv[] = {
880#define const_iv(name) { # name, name }, 1016#define const_iv(name) { # name, name },
881 const_iv (ASN_BOOLEAN) 1017 const_iv (ASN_BOOLEAN)
882 const_iv (ASN_INTEGER32) 1018 const_iv (ASN_INTEGER)
883 const_iv (ASN_BIT_STRING) 1019 const_iv (ASN_BIT_STRING)
884 const_iv (ASN_OCTET_STRING) 1020 const_iv (ASN_OCTET_STRING)
885 const_iv (ASN_NULL) 1021 const_iv (ASN_NULL)
886 const_iv (ASN_OBJECT_IDENTIFIER) 1022 const_iv (ASN_OBJECT_IDENTIFIER)
887 const_iv (ASN_OBJECT_DESCRIPTOR) 1023 const_iv (ASN_OBJECT_DESCRIPTOR)
916 const_iv (ASN_CONTEXT) 1052 const_iv (ASN_CONTEXT)
917 const_iv (ASN_PRIVATE) 1053 const_iv (ASN_PRIVATE)
918 1054
919 const_iv (BER_CLASS) 1055 const_iv (BER_CLASS)
920 const_iv (BER_TAG) 1056 const_iv (BER_TAG)
921 const_iv (BER_CONSTRUCTED) 1057 const_iv (BER_FLAGS)
922 const_iv (BER_DATA) 1058 const_iv (BER_DATA)
923 1059
924 const_iv (BER_TYPE_BYTES) 1060 const_iv (BER_TYPE_BYTES)
925 const_iv (BER_TYPE_UTF8) 1061 const_iv (BER_TYPE_UTF8)
926 const_iv (BER_TYPE_UCS2) 1062 const_iv (BER_TYPE_UCS2)
934 const_iv (BER_TYPE_IPADDRESS) 1070 const_iv (BER_TYPE_IPADDRESS)
935 const_iv (BER_TYPE_CROAK) 1071 const_iv (BER_TYPE_CROAK)
936 1072
937 const_iv (SNMP_IPADDRESS) 1073 const_iv (SNMP_IPADDRESS)
938 const_iv (SNMP_COUNTER32) 1074 const_iv (SNMP_COUNTER32)
1075 const_iv (SNMP_GAUGE32)
939 const_iv (SNMP_UNSIGNED32) 1076 const_iv (SNMP_UNSIGNED32)
940 const_iv (SNMP_TIMETICKS) 1077 const_iv (SNMP_TIMETICKS)
941 const_iv (SNMP_OPAQUE) 1078 const_iv (SNMP_OPAQUE)
942 const_iv (SNMP_COUNTER64) 1079 const_iv (SNMP_COUNTER64)
943 }; 1080 };
950ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1087ber_decode (SV *ber, SV *profile = &PL_sv_undef)
951 CODE: 1088 CODE:
952{ 1089{
953 cur_profile = SvPROFILE (profile); 1090 cur_profile = SvPROFILE (profile);
954 STRLEN len; 1091 STRLEN len;
955 buf = SvPVbyte (ber, len); 1092 buf = (U8 *)SvPVbyte (ber, len);
956 cur = buf; 1093 cur = buf;
957 end = buf + len; 1094 end = buf + len;
958 1095
959 RETVAL = decode_ber (); 1096 RETVAL = decode_ber ();
960} 1097}
961 OUTPUT: RETVAL 1098 OUTPUT: RETVAL
962 1099
963void 1100void
964ber_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)
965 PPCODE: 1102 PPCODE:
966{ 1103{
967 if (!SvOK (tuple)) 1104 if (!SvOK (tuple))
968 XSRETURN_NO; 1105 XSRETURN_NO;
969 1106
971 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1108 croak ("ber_is: tuple must be BER tuple (array-ref)");
972 1109
973 AV *av = (AV *)SvRV (tuple); 1110 AV *av = (AV *)SvRV (tuple);
974 1111
975 XPUSHs ( 1112 XPUSHs (
976 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1113 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
977 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1114 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
978 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1115 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
979 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1116 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
980 ? &PL_sv_yes : &PL_sv_undef); 1117 ? &PL_sv_yes : &PL_sv_undef);
981} 1118}
982 1119
983void 1120void
984ber_is_seq (SV *tuple) 1121ber_is_seq (SV *tuple)
988 XSRETURN_UNDEF; 1125 XSRETURN_UNDEF;
989 1126
990 AV *av = ber_tuple (tuple); 1127 AV *av = ber_tuple (tuple);
991 1128
992 XPUSHs ( 1129 XPUSHs (
993 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1130 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
994 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1131 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
995 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1132 && SvIV (AvARRAY (av)[BER_FLAGS])
996 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1133 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
997} 1134}
998 1135
999void 1136void
1000ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1137ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1001 PPCODE: 1138 PPCODE:
1002{ 1139{
1003 if (!SvOK (tuple)) 1140 if (!SvOK (tuple))
1004 XSRETURN_NO; 1141 XSRETURN_NO;
1005 1142
1006 AV *av = ber_tuple (tuple); 1143 AV *av = ber_tuple (tuple);
1007 1144
1008 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1145 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1009 1146
1010 XPUSHs ( 1147 XPUSHs (
1011 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1148 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1012 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1149 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1013 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1150 && !SvIV (AvARRAY (av)[BER_FLAGS])
1014 && (!SvOK (value) || data == SvIV (value)) 1151 && (!SvOK (value) || data == SvUV (value))
1015 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1152 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1016 : &PL_sv_undef); 1153 : &PL_sv_undef);
1017} 1154}
1018 1155
1019void 1156void
1020ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1157ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
1024 XSRETURN_NO; 1161 XSRETURN_NO;
1025 1162
1026 AV *av = ber_tuple (tuple); 1163 AV *av = ber_tuple (tuple);
1027 1164
1028 XPUSHs ( 1165 XPUSHs (
1029 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1166 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1030 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1167 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1031 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1168 && !SvIV (AvARRAY (av)[BER_FLAGS])
1032 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1169 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1033 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1170 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1034} 1171}
1035 1172
1036############################################################################# 1173#############################################################################
1049 SvCUR_set (buf_sv, cur - buf); 1186 SvCUR_set (buf_sv, cur - buf);
1050 XPUSHs (buf_sv); 1187 XPUSHs (buf_sv);
1051} 1188}
1052 1189
1053SV * 1190SV *
1054ber_i32 (IV iv) 1191ber_int (SV *sv)
1055 CODE: 1192 CODE:
1056{ 1193{
1057 AV *av = newAV (); 1194 AV *av = newAV ();
1058 av_fill (av, BER_ARRAYSIZE - 1); 1195 av_fill (av, BER_ARRAYSIZE - 1);
1059 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1196 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1060 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1197 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1061 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1198 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1062 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1199 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1063 RETVAL = newRV_noinc ((SV *)av); 1200 RETVAL = newRV_noinc ((SV *)av);
1064} 1201}
1065 OUTPUT: RETVAL 1202 OUTPUT: RETVAL
1066 1203
1067# TODO: not arrayref, but elements? 1204# TODO: not arrayref, but elements?
1069ber_seq (SV *arrayref) 1206ber_seq (SV *arrayref)
1070 CODE: 1207 CODE:
1071{ 1208{
1072 AV *av = newAV (); 1209 AV *av = newAV ();
1073 av_fill (av, BER_ARRAYSIZE - 1); 1210 av_fill (av, BER_ARRAYSIZE - 1);
1074 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1211 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1075 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1212 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1076 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1213 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1077 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1214 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1078 RETVAL = newRV_noinc ((SV *)av); 1215 RETVAL = newRV_noinc ((SV *)av);
1079} 1216}
1080 OUTPUT: RETVAL 1217 OUTPUT: RETVAL
1081 1218
1082MODULE = 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