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.5 by root, Fri Apr 19 23:50:53 2019 UTC vs.
Revision 1.18 by root, Sat Apr 20 16:12:53 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
… …
72 BER_TYPE_OID, 75 BER_TYPE_OID,
73 BER_TYPE_RELOID, 76 BER_TYPE_RELOID,
74 BER_TYPE_NULL, 77 BER_TYPE_NULL,
75 BER_TYPE_BOOL, 78 BER_TYPE_BOOL,
76 BER_TYPE_REAL, 79 BER_TYPE_REAL,
80 BER_TYPE_IPADDRESS,
77 BER_TYPE_CROAK, 81 BER_TYPE_CROAK,
78}; 82};
79 83
80enum { 84enum {
81 BER_CLASS = 0, 85 BER_CLASS = 0,
82 BER_TAG = 1, 86 BER_TAG = 1,
83 BER_CONSTRUCTED = 2, 87 BER_FLAGS = 2,
84 BER_DATA = 3, 88 BER_DATA = 3,
85 BER_ARRAYSIZE 89 BER_ARRAYSIZE
86}; 90};
87 91
88#define MAX_OID_STRLEN 4096 92#define MAX_OID_STRLEN 4096
89 93
90typedef void profile_type; 94typedef void profile_type;
91 95
92static profile_type *cur_profile, *default_profile; 96static profile_type *cur_profile, *default_profile;
93static SV *buf_sv; // encoding buffer 97static SV *buf_sv; // encoding buffer
94static U8 *buf, *cur, *end; // buffer start, current, end 98static U8 *buf, *cur, *end; // buffer start, current, end
99
100#if PERL_VERSION < 18
101# define utf8_to_uvchr_buf(s,e,l) utf8_to_uvchr (s, l)
102#endif
95 103
96#if __GNUC__ >= 3 104#if __GNUC__ >= 3
97# define expect(expr,value) __builtin_expect ((expr), (value)) 105# define expect(expr,value) __builtin_expect ((expr), (value))
98# define INLINE static inline 106# define INLINE static inline
99#else 107#else
… …
129 137
130static profile_type * 138static profile_type *
131SvPROFILE (SV *profile) 139SvPROFILE (SV *profile)
132{ 140{
133 if (!SvOK (profile)) 141 if (!SvOK (profile))
134 profile = default_profile; 142 return default_profile;
135 143
136 if (!SvROK (profile)) 144 if (!SvROK (profile))
137 croak ("invalid profile"); 145 croak ("invalid profile");
138 146
139 profile = SvRV (profile); 147 profile = SvRV (profile);
… …
154 return BER_TYPE_BYTES; 162 return BER_TYPE_BYTES;
155 163
156 return SvPVX (sv)[idx]; 164 return SvPVX (sv)[idx];
157} 165}
158 166
159static int 167static void
160profile_set (profile_type *profile, int klass, int tag, int type) 168profile_set (profile_type *profile, int klass, int tag, int type)
161{ 169{
162 SV *sv = (SV *)profile; 170 SV *sv = (SV *)profile;
163 U32 idx = (tag << 2) + klass; 171 U32 idx = (tag << 2) + klass;
164 STRLEN oldlen = SvCUR (sv); 172 STRLEN oldlen = SvCUR (sv);
… …
173 181
174 SvPVX (sv)[idx] = type; 182 SvPVX (sv)[idx] = type;
175} 183}
176 184
177static SV * 185static SV *
178profile_new () 186profile_new (void)
179{ 187{
180 SV *sv = newSVpvn ("", 0); 188 SV *sv = newSVpvn ("", 0);
181 189
182 static const struct { 190 static const struct {
183 int klass; 191 int klass;
184 int tag; 192 int tag;
185 int type; 193 int type;
186 } *celem, default_map[] = { 194 } *celem, default_map[] = {
187 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL }, 195 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },
188 { ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT }, 196 { ASN_UNIVERSAL, ASN_INTEGER , BER_TYPE_INT },
189 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL }, 197 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },
190 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID }, 198 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID },
191 { ASN_UNIVERSAL, ASN_OBJECT_DESCRIPTOR, BER_TYPE_OID },
192 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID }, 199 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
193 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL }, 200 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
201 { ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
194 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 }, 202 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },
195 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 }, 203 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },
196 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 }, 204 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },
197 }; 205 };
198 206
199 //const_iv (SNMP_IPADDRESS)
200 //const_iv (SNMP_COUNTER32)
201 //const_iv (SNMP_UNSIGNED32)
202 //const_iv (SNMP_TIMETICKS)
203 //const_iv (SNMP_OPAQUE)
204 //const_iv (SNMP_COUNTER64)
205
206 for (celem = default_map + sizeof (default_map) / sizeof (default_map [0]); celem > default_map; celem--) 207 for (celem = default_map + sizeof (default_map) / sizeof (default_map [0]); celem-- > default_map; )
207 profile_set ((void *)sv, celem->klass, celem->tag, celem->type); 208 profile_set ((profile_type *)sv, celem->klass, celem->tag, celem->type);
208 209
209 return sv_bless (newRV_noinc (sv), profile_stash); 210 return sv_bless (newRV_noinc (sv), profile_stash);
210} 211}
211 212
212///////////////////////////////////////////////////////////////////////////// 213/////////////////////////////////////////////////////////////////////////////
… …
247 248
248 return *cur++; 249 return *cur++;
249} 250}
250 251
251// get ber-encoded integer (i.e. pack "w") 252// get ber-encoded integer (i.e. pack "w")
252static U32 253static UV
253get_w (void) 254get_w (void)
254{ 255{
255 U32 res = 0; 256 UV res = 0;
256 257
257 for (;;) 258 for (;;)
258 { 259 {
259 U8 c = get_u8 (); 260 U8 c = get_u8 ();
260 res = (res << 7) | (c & 0x7f); 261 res = (res << 7) | (c & 0x7f);
… …
262 if (!(c & 0x80)) 263 if (!(c & 0x80))
263 return res; 264 return res;
264 } 265 }
265} 266}
266 267
267static U32 268static UV
268get_length (void) 269get_length (void)
269{ 270{
270 U32 res = get_u8 (); 271 UV res = get_u8 ();
271 272
272 if (res & 0x80) 273 if (res & 0x80)
273 { 274 {
274 int cnt = res & 0x7f; 275 int cnt = res & 0x7f;
275 res = 0; 276 res = 0;
… …
278 { 279 {
279 case 0: 280 case 0:
280 error ("indefinite ASN.1 lengths not supported"); 281 error ("indefinite ASN.1 lengths not supported");
281 return 0; 282 return 0;
282 283
284 //case 0x80: // indefinite length
285
286 //case 0xff: reserved
283 default: 287 default:
284 error ("ASN.1 length too long"); 288 error ("ASN.1 length too long");
285 return 0; 289 return 0;
286 290
291 case 8: res = (res << 8) | get_u8 ();
292 case 7: res = (res << 8) | get_u8 ();
293 case 6: res = (res << 8) | get_u8 ();
294 case 5: res = (res << 8) | get_u8 ();
287 case 4: res = (res << 8) | get_u8 (); 295 case 4: res = (res << 8) | get_u8 ();
288 case 3: res = (res << 8) | get_u8 (); 296 case 3: res = (res << 8) | get_u8 ();
289 case 2: res = (res << 8) | get_u8 (); 297 case 2: res = (res << 8) | get_u8 ();
290 case 1: res = (res << 8) | get_u8 (); 298 case 1: res = (res << 8) | get_u8 ();
291 } 299 }
… …
293 301
294 return res; 302 return res;
295} 303}
296 304
297static SV * 305static SV *
298decode_int () 306decode_int (void)
299{ 307{
300 int len = get_length (); 308 UV len = get_length ();
301 309
302 if (len <= 0) 310 if (!len)
303 { 311 {
304 error ("integer length equal to zero"); 312 error ("invalid integer length equal to zero");
305 return 0; 313 return 0;
306 } 314 }
307 315
308 U8 *data = get_n (len); 316 U8 *data = get_n (len);
309 317
… …
313 321
314 do 322 do
315 val = (val << 8) | *data++; 323 val = (val << 8) | *data++;
316 while (--len); 324 while (--len);
317 325
318 // the cats to IV relies on implementation-defined behaviour (two's complement cast) 326 // the cast to IV relies on implementation-defined behaviour (two's complement cast)
319 // but that's ok, as perl relies on it as well. 327 // but that's ok, as perl relies on it as well.
320 return negative ? newSViv ((IV)val) : newSVuv (val); 328 return negative ? newSViv ((IV)val) : newSVuv (val);
321} 329}
322 330
323static SV * 331static SV *
324decode_data (void) 332decode_data (void)
325{ 333{
326 U32 len = get_length (); 334 UV len = get_length ();
327 U8 *data = get_n (len);
328 return newSVpvn ((char *)data, len); 335 return newSVpvn ((char *)get_n (len), len);
329} 336}
330 337
331// gelper for decode_object_identifier 338// helper for decode_object_identifier
332static char * 339static char *
333write_uv (char *buf, U32 u) 340write_uv (char *buf, UV u)
334{ 341{
335 // the one-digit case is absolutely predominant, so this pays off (hopefully) 342 // the one-digit case is absolutely predominant, so this pays off (hopefully)
336 if (expect_true (u < 10)) 343 if (expect_true (u < 10))
337 *buf++ = u + '0'; 344 *buf++ = u + '0';
338 else 345 else
339 { 346 {
347 // this *could* be done much faster using branchless fixed-point arithmetics
340 char *beg = buf; 348 char *beg = buf;
341 349
342 do 350 do
343 { 351 {
344 *buf++ = u % 10 + '0'; 352 *buf++ = u % 10 + '0';
345 u /= 10; 353 u /= 10;
346 } 354 }
347 while (u); 355 while (u);
348 356
349 // reverse digits 357 // reverse digits
350 for (char *ptr = buf; --ptr != beg; ++beg) 358 char *ptr = buf;
359 while (--ptr > beg)
351 { 360 {
352 char c = *ptr; 361 char c = *ptr;
353 *ptr = *beg; 362 *ptr = *beg;
354 *beg = c; 363 *beg = c;
364 ++beg;
355 } 365 }
356 } 366 }
357 367
358 return buf; 368 return buf;
359} 369}
360 370
361static SV * 371static SV *
362decode_oid (int relative) 372decode_oid (int relative)
363{ 373{
364 U32 len = get_length (); 374 UV len = get_length ();
365 375
366 if (len <= 0) 376 if (len <= 0)
367 { 377 {
368 error ("OBJECT IDENTIFIER length equal to zero"); 378 error ("OBJECT IDENTIFIER length equal to zero");
369 return &PL_sv_undef; 379 return &PL_sv_undef;
370 } 380 }
371 381
372 U8 *end = cur + len; 382 U8 *end = cur + len;
373 U32 w = get_w (); 383 UV w = get_w ();
374 384
375 static char oid[MAX_OID_STRLEN]; // must be static 385 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack
376 char *app = oid; 386 char *app = oid;
377 387
378 if (relative) 388 if (relative)
379 app = write_uv (app, w); 389 app = write_uv (app, w);
380 else 390 else if (w < 2 * 40)
381 { 391 {
382 app = write_uv (app, (U8)w / 40); 392 app = write_uv (app, (U8)w / 40);
383 *app++ = '.'; 393 *app++ = '.';
384 app = write_uv (app, (U8)w % 40); 394 app = write_uv (app, (U8)w % 40);
385 } 395 }
396 else
397 {
398 app = write_uv (app, 2);
399 *app++ = '.';
400 app = write_uv (app, w - 2 * 40);
401 }
386 402
403 while (cur < end)
404 {
387 // we assume an oid component is never > 64 bytes 405 // we assume an oid component is never > 64 digits
388 while (cur < end && oid + sizeof (oid) - app > 64) 406 if (oid + sizeof (oid) - app < 64)
389 { 407 croak ("BER_TYPE_OID to long to decode");
408
390 w = get_w (); 409 w = get_w ();
391 *app++ = '.'; 410 *app++ = '.';
392 app = write_uv (app, w); 411 app = write_uv (app, w);
393 } 412 }
394 413
395 return newSVpvn (oid, app - oid); 414 return newSVpvn (oid, app - oid);
396} 415}
397 416
417// TODO: this is unacceptably slow
398static SV * 418static SV *
419decode_ucs (int chrsize)
420{
421 SV *res = NEWSV (0, 0);
422
423 UV len = get_length ();
424
425 if (len & (chrsize - 1))
426 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
427
428 while (len)
429 {
430 U8 b1 = get_u8 ();
431 U8 b2 = get_u8 ();
432 U32 chr = (b1 << 8) | b2;
433
434 if (chrsize == 4)
435 {
436 U8 b3 = get_u8 ();
437 U8 b4 = get_u8 ();
438 chr = (chr << 16) | (b3 << 8) | b4;
439 }
440
441 U8 uchr [UTF8_MAXBYTES];
442 int uclen = uvuni_to_utf8 (uchr, chr) - uchr;
443
444 sv_catpvn (res, (const char *)uchr, uclen);
445 len -= chrsize;
446 }
447
448 SvUTF8_on (res);
449
450 return res;
451}
452
453static SV *
399decode_ber () 454decode_ber (void)
400{ 455{
401 int identifier = get_u8 (); 456 int identifier = get_u8 ();
402 457
403 SV *res; 458 SV *res;
404 459
… …
412 if (tag == ASN_TAG_BER) 467 if (tag == ASN_TAG_BER)
413 tag = get_w (); 468 tag = get_w ();
414 469
415 if (constructed) 470 if (constructed)
416 { 471 {
417 U32 len = get_length (); 472 UV len = get_length ();
418 U32 seqend = (cur - buf) + len; 473 UV seqend = (cur - buf) + len;
419 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 474 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
420 475
421 while (cur < buf + seqend) 476 while (cur < buf + seqend)
422 av_push (av, decode_ber ()); 477 av_push (av, decode_ber ());
423 478
… …
428 } 483 }
429 else 484 else
430 switch (profile_lookup (cur_profile, klass, tag)) 485 switch (profile_lookup (cur_profile, klass, tag))
431 { 486 {
432 case BER_TYPE_NULL: 487 case BER_TYPE_NULL:
488 {
489 UV len = get_length ();
490
491 if (len)
492 croak ("BER_TYPE_NULL value with non-zero length %d encountered", len);
493
433 res = &PL_sv_undef; 494 res = &PL_sv_undef;
495 }
434 break; 496 break;
435 497
436 case BER_TYPE_BOOL: 498 case BER_TYPE_BOOL:
437 { 499 {
438 U32 len = get_length (); 500 UV len = get_length ();
439 501
440 if (len != 1) 502 if (len != 1)
441 croak ("BOOLEAN type with invalid length %d encountered", len); 503 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len);
442 504
443 res = newSVcacheint (get_u8 () ? 0 : 1); 505 res = newSVcacheint (!!get_u8 ());
444 } 506 }
445 break; 507 break;
446 508
447 case BER_TYPE_OID: 509 case BER_TYPE_OID:
448 res = decode_oid (0); 510 res = decode_oid (0);
… …
463 525
464 case BER_TYPE_BYTES: 526 case BER_TYPE_BYTES:
465 res = decode_data (); 527 res = decode_data ();
466 break; 528 break;
467 529
530 case BER_TYPE_IPADDRESS:
531 {
532 UV len = get_length ();
533
534 if (len != 4)
535 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len);
536
537 U8 c1 = get_u8 ();
538 U8 c2 = get_u8 ();
539 U8 c3 = get_u8 ();
540 U8 c4 = get_u8 ();
541
542 res = newSVpvf ("%d.%d.%d.%d", c1, c2, c3, c4);
543 }
544 break;
545
546 case BER_TYPE_UCS2:
547 res = decode_ucs (2);
548 break;
549
550 case BER_TYPE_UCS4:
551 res = decode_ucs (4);
552 break;
553
468 case BER_TYPE_REAL: 554 case BER_TYPE_REAL:
469 case BER_TYPE_UCS2:
470 case BER_TYPE_UCS4:
471 case BER_TYPE_CROAK: 555 case BER_TYPE_CROAK:
472 default: 556 default:
473 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 557 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
474 } 558 }
475 559
476 AV *av = newAV (); 560 AV *av = newAV ();
477 av_fill (av, BER_ARRAYSIZE - 1); 561 av_fill (av, BER_ARRAYSIZE - 1);
478 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 562 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
479 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 563 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
480 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 564 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
481 AvARRAY (av)[BER_DATA ] = res; 565 AvARRAY (av)[BER_DATA ] = res;
482 566
483 return newRV_noinc ((SV *)av); 567 return newRV_noinc ((SV *)av);
484} 568}
485 569
486///////////////////////////////////////////////////////////////////////////// 570/////////////////////////////////////////////////////////////////////////////
… …
501static void 585static void
502set_buf (SV *sv) 586set_buf (SV *sv)
503{ 587{
504 STRLEN len; 588 STRLEN len;
505 buf_sv = sv; 589 buf_sv = sv;
506 buf = SvPVbyte (buf_sv, len); 590 buf = (U8 *)SvPVbyte (buf_sv, len);
507 cur = buf; 591 cur = buf;
508 end = buf + len; 592 end = buf + len;
509} 593}
510 594
511/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */ 595/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
… …
525need (STRLEN len) 609need (STRLEN len)
526{ 610{
527 if (expect_false ((uintptr_t)(end - cur) < len)) 611 if (expect_false ((uintptr_t)(end - cur) < len))
528 { 612 {
529 STRLEN pos = cur - buf; 613 STRLEN pos = cur - buf;
530 buf = my_sv_grow (buf_sv, pos, len); 614 buf = (U8 *)my_sv_grow (buf_sv, pos, len);
531 cur = buf + pos; 615 cur = buf + pos;
532 end = buf + SvLEN (buf_sv) - 1; 616 end = buf + SvLEN (buf_sv) - 1;
533 } 617 }
534} 618}
535 619
… …
539 need (1); 623 need (1);
540 *cur++ = val; 624 *cur++ = val;
541} 625}
542 626
543static void 627static void
544put_w_nocheck (U32 val) 628put_w_nocheck (UV val)
545{ 629{
630#if UVSIZE > 4
631 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
632 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
633 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
634 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
635 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
636#endif
546 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 637 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
547 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 638 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
548 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 639 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
549 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 640 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
550 *cur = val & 0x7f; cur += 1; 641 *cur = val & 0x7f; cur += 1;
551} 642}
552 643
553static void 644static void
554put_w (U32 val) 645put_w (UV val)
555{ 646{
556 need (5); // we only handle up to 5 bytes 647 need (5); // we only handle up to 5 bytes
557 648
558 put_w_nocheck (val); 649 put_w_nocheck (val);
559} 650}
560 651
561static U8 * 652static U8 *
562put_length_at (U32 val, U8 *cur) 653put_length_at (UV val, U8 *cur)
563{ 654{
564 if (val < 0x7fU) 655 if (val < 0x7fU)
565 *cur++ = val; 656 *cur++ = val;
566 else 657 else
567 { 658 {
568 U8 *lenb = cur++; 659 U8 *lenb = cur++;
569 660
661#if UVSIZE > 4
662 *cur = val >> 56; cur += *cur > 0;
663 *cur = val >> 48; cur += *cur > 0;
664 *cur = val >> 40; cur += *cur > 0;
665 *cur = val >> 32; cur += *cur > 0;
666#endif
570 *cur = val >> 24; cur += *cur > 0; 667 *cur = val >> 24; cur += *cur > 0;
571 *cur = val >> 16; cur += *cur > 0; 668 *cur = val >> 16; cur += *cur > 0;
572 *cur = val >> 8; cur += *cur > 0; 669 *cur = val >> 8; cur += *cur > 0;
573 *cur = val ; cur += 1; 670 *cur = val ; cur += 1;
574 671
… …
577 674
578 return cur; 675 return cur;
579} 676}
580 677
581static void 678static void
582put_length (U32 val) 679put_length (UV val)
583{ 680{
584 need (5); 681 need (5 + val);
585 cur = put_length_at (val, cur); 682 cur = put_length_at (val, cur);
586} 683}
587 684
588// return how many bytes the encoded length requires 685// return how many bytes the encoded length requires
589static int length_length (U32 val) 686static int length_length (UV val)
590{ 687{
591 return val < 0x7fU 688 return val < 0x7fU
592 ? 1 689 ? 1
593 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 690 : 2
691 + (val > 0xffU)
692 + (val > 0xffffU)
693 + (val > 0xffffffU)
694#if UVSIZE > 4
695 + (val > 0xffffffffU)
696 + (val > 0xffffffffffU)
697 + (val > 0xffffffffffffU)
698 + (val > 0xffffffffffffffU)
699#endif
700 ;
594} 701}
595 702
596static void 703static void
597encode_data (const char *ptr, STRLEN len) 704encode_data (const char *ptr, STRLEN len)
598{ 705{
599 put_length (len); 706 put_length (len);
600 need (len);
601 memcpy (cur, ptr, len); 707 memcpy (cur, ptr, len);
602 cur += len; 708 cur += len;
603} 709}
604 710
605static void 711static void
… …
661 767
662 *lenb = cur - lenb - 1; 768 *lenb = cur - lenb - 1;
663} 769}
664 770
665// we don't know the length yet, so we optimistically 771// we don't know the length yet, so we optimistically
666// assume the length will need one octet later. if that 772// assume the length will need one octet later. If that
667// turns out to be wrong, we memove as needed. 773// turns out to be wrong, we memmove as needed.
668// mark the beginning 774// mark the beginning
669static STRLEN 775static STRLEN
670len_fixup_mark () 776len_fixup_mark (void)
671{ 777{
672 return cur++ - buf; 778 return cur++ - buf;
673} 779}
674 780
675// patch up the length 781// patch up the length
… …
751 857
752 return (AV *)rv; 858 return (AV *)rv;
753} 859}
754 860
755static void 861static void
862encode_ucs (SV *data, int chrsize)
863{
864 STRLEN uchars = sv_len_utf8 (data);
865 STRLEN len;;
866 char *ptr = SvPVutf8 (data, len);
867
868 put_length (uchars * chrsize);
869
870 while (uchars--)
871 {
872 STRLEN uclen;
873 UV uchr = utf8_to_uvchr_buf ((U8 *)ptr, (U8 *)ptr + len, &uclen);
874
875 ptr += uclen;
876 len -= uclen;
877
878 if (chrsize == 4)
879 {
880 *cur++ = uchr >> 24;
881 *cur++ = uchr >> 16;
882 }
883
884 *cur++ = uchr >> 8;
885 *cur++ = uchr;
886 }
887}
888static void
756encode_ber (SV *tuple) 889encode_ber (SV *tuple)
757{ 890{
758 AV *av = ber_tuple (tuple); 891 AV *av = ber_tuple (tuple);
759 892
760 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 893 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
761 int tag = SvIV (AvARRAY (av)[BER_TAG]); 894 int tag = SvIV (AvARRAY (av)[BER_TAG]);
762 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 895 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
763 SV *data = AvARRAY (av)[BER_DATA]; 896 SV *data = AvARRAY (av)[BER_DATA];
764 897
765 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 898 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
766 899
767 if (expect_false (tag >= ASN_TAG_BER)) 900 if (expect_false (tag >= ASN_TAG_BER))
… …
786 int fill = AvFILL (av); 919 int fill = AvFILL (av);
787 920
788 if (expect_false (SvRMAGICAL (av))) 921 if (expect_false (SvRMAGICAL (av)))
789 croak ("BER constructed data must not be tied"); 922 croak ("BER constructed data must not be tied");
790 923
924 int i;
791 for (int i = 0; i <= fill; ++i) 925 for (i = 0; i <= fill; ++i)
792 encode_ber (AvARRAY (av)[i]); 926 encode_ber (AvARRAY (av)[i]);
793 927
794 len_fixup (mark); 928 len_fixup (mark);
795 } 929 }
796 else 930 else
… …
800 put_length (0); 934 put_length (0);
801 break; 935 break;
802 936
803 case BER_TYPE_BOOL: 937 case BER_TYPE_BOOL:
804 put_length (1); 938 put_length (1);
805 put_u8 (SvTRUE (data) ? 0xff : 0x00); 939 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
806 break; 940 break;
807 941
808 case BER_TYPE_OID: 942 case BER_TYPE_OID:
809 encode_oid (data, 0); 943 encode_oid (data, 0);
810 break; 944 break;
… …
831 const char *ptr = SvPVutf8 (data, len); 965 const char *ptr = SvPVutf8 (data, len);
832 encode_data (ptr, len); 966 encode_data (ptr, len);
833 } 967 }
834 break; 968 break;
835 969
970 case BER_TYPE_IPADDRESS:
971 {
972 U8 ip[4];
973 sscanf (SvPV_nolen (data), "%hhu.%hhu.%hhu.%hhu", ip + 0, ip + 1, ip + 2, ip + 3);
974 encode_data ((const char *)ip, sizeof (ip));
975 }
976 break;
977
978 case BER_TYPE_UCS2:
979 encode_ucs (data, 2);
980 break;
981
982 case BER_TYPE_UCS4:
983 encode_ucs (data, 4);
984 break;
985
836 case BER_TYPE_REAL: 986 case BER_TYPE_REAL:
837 case BER_TYPE_UCS2:
838 case BER_TYPE_UCS4:
839 case BER_TYPE_CROAK: 987 case BER_TYPE_CROAK:
840 default: 988 default:
841 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 989 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
842 } 990 }
843 991
… …
859 const char *name; 1007 const char *name;
860 IV iv; 1008 IV iv;
861 } *civ, const_iv[] = { 1009 } *civ, const_iv[] = {
862#define const_iv(name) { # name, name }, 1010#define const_iv(name) { # name, name },
863 const_iv (ASN_BOOLEAN) 1011 const_iv (ASN_BOOLEAN)
864 const_iv (ASN_INTEGER32) 1012 const_iv (ASN_INTEGER)
865 const_iv (ASN_BIT_STRING) 1013 const_iv (ASN_BIT_STRING)
866 const_iv (ASN_OCTET_STRING) 1014 const_iv (ASN_OCTET_STRING)
867 const_iv (ASN_NULL) 1015 const_iv (ASN_NULL)
868 const_iv (ASN_OBJECT_IDENTIFIER) 1016 const_iv (ASN_OBJECT_IDENTIFIER)
869 const_iv (ASN_OBJECT_DESCRIPTOR) 1017 const_iv (ASN_OBJECT_DESCRIPTOR)
… …
898 const_iv (ASN_CONTEXT) 1046 const_iv (ASN_CONTEXT)
899 const_iv (ASN_PRIVATE) 1047 const_iv (ASN_PRIVATE)
900 1048
901 const_iv (BER_CLASS) 1049 const_iv (BER_CLASS)
902 const_iv (BER_TAG) 1050 const_iv (BER_TAG)
903 const_iv (BER_CONSTRUCTED) 1051 const_iv (BER_FLAGS)
904 const_iv (BER_DATA) 1052 const_iv (BER_DATA)
905 1053
906 const_iv (BER_TYPE_BYTES) 1054 const_iv (BER_TYPE_BYTES)
907 const_iv (BER_TYPE_UTF8) 1055 const_iv (BER_TYPE_UTF8)
908 const_iv (BER_TYPE_UCS2) 1056 const_iv (BER_TYPE_UCS2)
… …
911 const_iv (BER_TYPE_OID) 1059 const_iv (BER_TYPE_OID)
912 const_iv (BER_TYPE_RELOID) 1060 const_iv (BER_TYPE_RELOID)
913 const_iv (BER_TYPE_NULL) 1061 const_iv (BER_TYPE_NULL)
914 const_iv (BER_TYPE_BOOL) 1062 const_iv (BER_TYPE_BOOL)
915 const_iv (BER_TYPE_REAL) 1063 const_iv (BER_TYPE_REAL)
1064 const_iv (BER_TYPE_IPADDRESS)
916 const_iv (BER_TYPE_CROAK) 1065 const_iv (BER_TYPE_CROAK)
917 1066
918 const_iv (SNMP_IPADDRESS) 1067 const_iv (SNMP_IPADDRESS)
919 const_iv (SNMP_COUNTER32) 1068 const_iv (SNMP_COUNTER32)
920 const_iv (SNMP_UNSIGNED32) 1069 const_iv (SNMP_UNSIGNED32)
921 const_iv (SNMP_TIMETICKS) 1070 const_iv (SNMP_TIMETICKS)
922 const_iv (SNMP_OPAQUE) 1071 const_iv (SNMP_OPAQUE)
923 const_iv (SNMP_COUNTER64) 1072 const_iv (SNMP_COUNTER64)
924
925 }; 1073 };
926 1074
927 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) 1075 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
928 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1076 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
929
930 default_profile = profile_new ();
931} 1077}
932 1078
933SV * 1079SV *
934ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1080ber_decode (SV *ber, SV *profile = &PL_sv_undef)
935 CODE: 1081 CODE:
936{ 1082{
937 cur_profile = SvPROFILE (profile); 1083 cur_profile = SvPROFILE (profile);
938 STRLEN len; 1084 STRLEN len;
939 buf = SvPVbyte (ber, len); 1085 buf = (U8 *)SvPVbyte (ber, len);
940 cur = buf; 1086 cur = buf;
941 end = buf + len; 1087 end = buf + len;
942 1088
943 RETVAL = decode_ber (); 1089 RETVAL = decode_ber ();
944} 1090}
945 OUTPUT: RETVAL 1091 OUTPUT: RETVAL
946 1092
947void 1093void
948ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &PL_sv_undef, SV *data = &PL_sv_undef) 1094ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *flags = &PL_sv_undef, SV *data = &PL_sv_undef)
949 PPCODE: 1095 PPCODE:
950{ 1096{
951 if (!SvOK (tuple)) 1097 if (!SvOK (tuple))
952 XSRETURN_NO; 1098 XSRETURN_NO;
953 1099
… …
955 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1101 croak ("ber_is: tuple must be BER tuple (array-ref)");
956 1102
957 AV *av = (AV *)SvRV (tuple); 1103 AV *av = (AV *)SvRV (tuple);
958 1104
959 XPUSHs ( 1105 XPUSHs (
960 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1106 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
961 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1107 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
962 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1108 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
963 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1109 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
964 ? &PL_sv_yes : &PL_sv_undef); 1110 ? &PL_sv_yes : &PL_sv_undef);
965} 1111}
966 1112
967void 1113void
968ber_is_seq (SV *tuple) 1114ber_is_seq (SV *tuple)
… …
972 XSRETURN_UNDEF; 1118 XSRETURN_UNDEF;
973 1119
974 AV *av = ber_tuple (tuple); 1120 AV *av = ber_tuple (tuple);
975 1121
976 XPUSHs ( 1122 XPUSHs (
977 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1123 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
978 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1124 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
979 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1125 && SvIV (AvARRAY (av)[BER_FLAGS])
980 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1126 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
981} 1127}
982 1128
983void 1129void
984ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1130ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
985 PPCODE: 1131 PPCODE:
986{ 1132{
987 if (!SvOK (tuple)) 1133 if (!SvOK (tuple))
988 XSRETURN_NO; 1134 XSRETURN_NO;
989 1135
990 AV *av = ber_tuple (tuple); 1136 AV *av = ber_tuple (tuple);
991 1137
992 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1138 UV data = SvUV (AvARRAY (av)[BER_DATA]);
993 1139
994 XPUSHs ( 1140 XPUSHs (
995 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1141 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
996 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1142 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
997 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1143 && !SvIV (AvARRAY (av)[BER_FLAGS])
998 && (!SvOK (value) || data == SvIV (value)) 1144 && (!SvOK (value) || data == SvUV (value))
999 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1145 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1000 : &PL_sv_undef); 1146 : &PL_sv_undef);
1001} 1147}
1002 1148
1003void 1149void
1004ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1150ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
… …
1008 XSRETURN_NO; 1154 XSRETURN_NO;
1009 1155
1010 AV *av = ber_tuple (tuple); 1156 AV *av = ber_tuple (tuple);
1011 1157
1012 XPUSHs ( 1158 XPUSHs (
1013 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1159 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1014 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1160 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1015 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1161 && !SvIV (AvARRAY (av)[BER_FLAGS])
1016 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1162 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1017 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1163 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1018} 1164}
1019 1165
1020############################################################################# 1166#############################################################################
… …
1033 SvCUR_set (buf_sv, cur - buf); 1179 SvCUR_set (buf_sv, cur - buf);
1034 XPUSHs (buf_sv); 1180 XPUSHs (buf_sv);
1035} 1181}
1036 1182
1037SV * 1183SV *
1038ber_i32 (IV iv) 1184ber_int (SV *sv)
1039 CODE: 1185 CODE:
1040{ 1186{
1041 AV *av = newAV (); 1187 AV *av = newAV ();
1042 av_fill (av, BER_ARRAYSIZE - 1); 1188 av_fill (av, BER_ARRAYSIZE - 1);
1043 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1189 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1044 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1190 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1045 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1191 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1046 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1192 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1047 RETVAL = newRV_noinc ((SV *)av); 1193 RETVAL = newRV_noinc ((SV *)av);
1048} 1194}
1049 OUTPUT: RETVAL 1195 OUTPUT: RETVAL
1050 1196
1051# TODO: not arrayref, but elements? 1197# TODO: not arrayref, but elements?
… …
1053ber_seq (SV *arrayref) 1199ber_seq (SV *arrayref)
1054 CODE: 1200 CODE:
1055{ 1201{
1056 AV *av = newAV (); 1202 AV *av = newAV ();
1057 av_fill (av, BER_ARRAYSIZE - 1); 1203 av_fill (av, BER_ARRAYSIZE - 1);
1058 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1204 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1059 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1205 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1060 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1206 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1061 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1207 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1062 RETVAL = newRV_noinc ((SV *)av); 1208 RETVAL = newRV_noinc ((SV *)av);
1063} 1209}
1064 OUTPUT: RETVAL 1210 OUTPUT: RETVAL
1065 1211
1066MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1212MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile
… …
1069new (SV *klass) 1215new (SV *klass)
1070 CODE: 1216 CODE:
1071 RETVAL = profile_new (); 1217 RETVAL = profile_new ();
1072 OUTPUT: RETVAL 1218 OUTPUT: RETVAL
1073 1219
1220void
1221set (SV *profile, int klass, int tag, int type)
1222 CODE:
1223 profile_set (SvPROFILE (profile), klass, tag, type);
1224
1225IV
1226get (SV *profile, int klass, int tag)
1227 CODE:
1228 RETVAL = profile_lookup (SvPROFILE (profile), klass, tag);
1229 OUTPUT: RETVAL
1230
1231void
1232_set_default (SV *profile)
1233 CODE:
1234 default_profile = SvPROFILE (profile);
1235
1236

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines