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.32 by root, Tue Apr 23 21:20:25 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};
65 69
70// tlow-level types this module can ecode the above (and more) into
66enum { 71enum {
67 BER_TYPE_BYTES, 72 BER_TYPE_BYTES,
68 BER_TYPE_UTF8, 73 BER_TYPE_UTF8,
69 BER_TYPE_UCS2, 74 BER_TYPE_UCS2,
70 BER_TYPE_UCS4, 75 BER_TYPE_UCS4,
76 BER_TYPE_REAL, 81 BER_TYPE_REAL,
77 BER_TYPE_IPADDRESS, 82 BER_TYPE_IPADDRESS,
78 BER_TYPE_CROAK, 83 BER_TYPE_CROAK,
79}; 84};
80 85
86// tuple array indices
81enum { 87enum {
82 BER_CLASS = 0, 88 BER_CLASS = 0,
83 BER_TAG = 1, 89 BER_TAG = 1,
84 BER_CONSTRUCTED = 2, 90 BER_FLAGS = 2,
85 BER_DATA = 3, 91 BER_DATA = 3,
86 BER_ARRAYSIZE 92 BER_ARRAYSIZE
87}; 93};
88 94
89#define MAX_OID_STRLEN 4096 95#define MAX_OID_STRLEN 4096
90 96
91typedef void profile_type; 97typedef void profile_type;
92 98
93static profile_type *cur_profile, *default_profile; 99static profile_type *cur_profile, *default_profile;
94static SV *buf_sv; // encoding buffer 100static SV *buf_sv; // encoding buffer
95static U8 *buf, *cur, *end; // buffer start, current, end 101static U8 *buf, *cur, *end; // buffer start, current, end
102
103#if PERL_VERSION < 18
104# define utf8_to_uvchr_buf(s,e,l) utf8_to_uvchr (s, l)
105#endif
96 106
97#if __GNUC__ >= 3 107#if __GNUC__ >= 3
98# define expect(expr,value) __builtin_expect ((expr), (value)) 108# define expect(expr,value) __builtin_expect ((expr), (value))
99# define INLINE static inline 109# define INLINE static inline
100#else 110#else
133{ 143{
134 if (!SvOK (profile)) 144 if (!SvOK (profile))
135 return default_profile; 145 return default_profile;
136 146
137 if (!SvROK (profile)) 147 if (!SvROK (profile))
138 croak ("invalid profile"); 148 croak ("Convert::BER::XS::Profile expected");
139 149
140 profile = SvRV (profile); 150 profile = SvRV (profile);
141 151
142 if (SvSTASH (profile) != profile_stash) 152 if (SvSTASH (profile) != profile_stash)
143 croak ("invalid profile object"); 153 croak ("Convert::BER::XS::Profile expected");
144 154
145 return (void *)profile; 155 return (void *)profile;
146} 156}
147 157
148static int 158static int
155 return BER_TYPE_BYTES; 165 return BER_TYPE_BYTES;
156 166
157 return SvPVX (sv)[idx]; 167 return SvPVX (sv)[idx];
158} 168}
159 169
160static int 170static void
161profile_set (profile_type *profile, int klass, int tag, int type) 171profile_set (profile_type *profile, int klass, int tag, int type)
162{ 172{
163 SV *sv = (SV *)profile; 173 SV *sv = (SV *)profile;
164 U32 idx = (tag << 2) + klass; 174 U32 idx = (tag << 2) + klass;
165 STRLEN oldlen = SvCUR (sv); 175 STRLEN oldlen = SvCUR (sv);
174 184
175 SvPVX (sv)[idx] = type; 185 SvPVX (sv)[idx] = type;
176} 186}
177 187
178static SV * 188static SV *
179profile_new () 189profile_new (void)
180{ 190{
181 SV *sv = newSVpvn ("", 0); 191 SV *sv = newSVpvn ("", 0);
182 192
183 static const struct { 193 static const struct {
184 int klass; 194 int klass;
185 int tag; 195 int tag;
186 int type; 196 int type;
187 } *celem, default_map[] = { 197 } *celem, default_map[] = {
188 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL }, 198 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },
189 { ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT }, 199 { ASN_UNIVERSAL, ASN_INTEGER , BER_TYPE_INT },
190 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL }, 200 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },
191 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID }, 201 { 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 }, 202 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
194 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL }, 203 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
204 { ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
195 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 }, 205 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },
196 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 }, 206 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },
197 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 }, 207 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },
198 }; 208 };
199 209
200 for (celem = default_map + sizeof (default_map) / sizeof (default_map [0]); celem > default_map; celem--) 210 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); 211 profile_set ((profile_type *)sv, celem->klass, celem->tag, celem->type);
202 212
203 return sv_bless (newRV_noinc (sv), profile_stash); 213 return sv_bless (newRV_noinc (sv), profile_stash);
204} 214}
205 215
206///////////////////////////////////////////////////////////////////////////// 216/////////////////////////////////////////////////////////////////////////////
219 error ("unexpected end of message buffer"); 229 error ("unexpected end of message buffer");
220} 230}
221 231
222// get_* functions fetch something from the buffer 232// get_* functions fetch something from the buffer
223// decode_* functions use get_* fun ctions to decode ber values 233// decode_* functions use get_* fun ctions to decode ber values
234
235// get single octet
236static U8
237get_u8 (void)
238{
239 if (cur == end)
240 error ("unexpected end of message buffer");
241
242 return *cur++;
243}
224 244
225// get n octets 245// get n octets
226static U8 * 246static U8 *
227get_n (UV count) 247get_n (UV count)
228{ 248{
230 U8 *res = cur; 250 U8 *res = cur;
231 cur += count; 251 cur += count;
232 return res; 252 return res;
233} 253}
234 254
235// get single octet
236static U8
237get_u8 (void)
238{
239 if (cur == end)
240 error ("unexpected end of message buffer");
241
242 return *cur++;
243}
244
245// get ber-encoded integer (i.e. pack "w") 255// get ber-encoded integer (i.e. pack "w")
246static U32 256static UV
247get_w (void) 257get_w (void)
248{ 258{
249 U32 res = 0; 259 UV res = 0;
260 U8 c = get_u8 ();
261
262 if (expect_false (c == 0x80))
263 error ("illegal BER padding (X.690 8.1.2.4.2, 8.19.2)");
250 264
251 for (;;) 265 for (;;)
252 { 266 {
253 U8 c = get_u8 (); 267 if (expect_false (res >> UVSIZE * 8 - 7))
268 error ("BER variable length integer overflow");
269
254 res = (res << 7) | (c & 0x7f); 270 res = (res << 7) | (c & 0x7f);
255 271
256 if (!(c & 0x80)) 272 if (expect_true (!(c & 0x80)))
257 return res; 273 return res;
258 }
259}
260 274
275 c = get_u8 ();
276 }
277}
278
261static U32 279static UV
262get_length (void) 280get_length (void)
263{ 281{
264 U32 res = get_u8 (); 282 UV res = get_u8 ();
265 283
266 if (res & 0x80) 284 if (expect_false (res & 0x80))
267 { 285 {
268 int cnt = res & 0x7f; 286 U8 cnt = res & 0x7f;
287
288 // this genewrates quite ugly code, but the overhead
289 // of copying the bytes for these lengths is probably so high
290 // that a slightly inefficient get_length won't matter.
291
292 if (expect_false (cnt == 0))
293 error ("illegal use of indefinite BER length form in primitive encoding (X.690 8.1.3.2)");
294
295 if (expect_false (cnt > UVSIZE))
296 error ("BER value length too long (must fit into UV) or BER reserved value in length (X.690 8.1.3.5)");
297
298 want (cnt);
299
269 res = 0; 300 res = 0;
270 301 do
271 switch (cnt) 302 res = (res << 8) | *cur++;
272 { 303 while (--cnt);
273 case 0:
274 error ("indefinite ASN.1 lengths not supported");
275 return 0;
276
277 default:
278 error ("ASN.1 length too long");
279 return 0;
280
281 case 4: res = (res << 8) | get_u8 ();
282 case 3: res = (res << 8) | get_u8 ();
283 case 2: res = (res << 8) | get_u8 ();
284 case 1: res = (res << 8) | get_u8 ();
285 }
286 } 304 }
287 305
288 return res; 306 return res;
289} 307}
290 308
291static SV * 309static SV *
292decode_int () 310decode_int (UV len)
293{ 311{
294 int len = get_length ();
295
296 if (len <= 0) 312 if (!len)
297 { 313 error ("invalid BER_TYPE_INT length zero (X.690 8.3.1)");
298 error ("integer length equal to zero");
299 return 0;
300 }
301 314
302 U8 *data = get_n (len); 315 U8 *data = get_n (len);
303 316
317 if (expect_false (len > 1))
318 {
319 U16 mask = (data [0] << 8) | data [1] & 0xff80;
320
321 if (expect_false (mask == 0xff80 || mask == 0x0000))
322 error ("illegal padding in BER_TYPE_INT (X.690 8.3.2)");
323 }
324
304 int negative = data [0] & 0x80; 325 int negative = data [0] & 0x80;
305 326
306 UV val = negative ? -1 : 0; // copy signbit to all bits 327 UV val = negative ? -1 : 0; // copy signbit to all bits
328
329 if (len > UVSIZE + (!negative && !*data))
330 error ("BER_TYPE_INT overflow");
307 331
308 do 332 do
309 val = (val << 8) | *data++; 333 val = (val << 8) | *data++;
310 while (--len); 334 while (--len);
311 335
313 // but that's ok, as perl relies on it as well. 337 // but that's ok, as perl relies on it as well.
314 return negative ? newSViv ((IV)val) : newSVuv (val); 338 return negative ? newSViv ((IV)val) : newSVuv (val);
315} 339}
316 340
317static SV * 341static SV *
318decode_data (void) 342decode_data (UV len)
319{ 343{
320 U32 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 (UV len, int relative)
357{ 382{
358 U32 len = get_length ();
359
360 if (len <= 0) 383 if (len <= 0)
361 { 384 {
362 error ("OBJECT IDENTIFIER length equal to zero"); 385 error ("BER_TYPE_OID length must not be zero");
363 return &PL_sv_undef; 386 return &PL_sv_undef;
364 } 387 }
365 388
366 U8 *end = cur + len; 389 U8 *end = cur + len;
367 U32 w = get_w (); 390 UV w = get_w ();
368 391
369 static char oid[MAX_OID_STRLEN]; // must be static 392 static char oid[MAX_OID_STRLEN]; // static, because too large for stack
370 char *app = oid; 393 char *app = oid;
371 394
372 if (relative) 395 if (relative)
373 app = write_uv (app, w); 396 app = write_uv (app, w);
374 else 397 else
375 { 398 {
399 UV w1, w2;
400
401 if (w < 2 * 40)
402 (w1 = w / 40), (w2 = w % 40);
403 else
404 (w1 = 2), (w2 = w - 2 * 40);
405
376 app = write_uv (app, (U8)w / 40); 406 app = write_uv (app, w1);
377 *app++ = '.'; 407 *app++ = '.';
378 app = write_uv (app, (U8)w % 40); 408 app = write_uv (app, w2);
409 }
410
411 while (cur < end)
379 } 412 {
380
381 // we assume an oid component is never > 64 bytes 413 // we assume an oid component is never > 64 digits
382 while (cur < end && oid + sizeof (oid) - app > 64) 414 if (oid + sizeof (oid) - app < 64)
383 { 415 croak ("BER_TYPE_OID to long to decode");
416
384 w = get_w (); 417 w = get_w ();
385 *app++ = '.'; 418 *app++ = '.';
386 app = write_uv (app, w); 419 app = write_uv (app, w);
387 } 420 }
388 421
389 return newSVpvn (oid, app - oid); 422 return newSVpvn (oid, app - oid);
390} 423}
391 424
392// TODO: this is unacceptably slow 425// TODO: this is unacceptably slow
393static SV * 426static SV *
394decode_ucs (int chrsize) 427decode_ucs (UV len, int chrsize)
395{ 428{
396 SV *res = NEWSV (0, 0);
397
398 U32 len = get_length ();
399
400 if (len & (chrsize - 1)) 429 if (len & (chrsize - 1))
401 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len); 430 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
431
432 SV *res = NEWSV (0, 0);
402 433
403 while (len) 434 while (len)
404 { 435 {
405 U8 b1 = get_u8 (); 436 U8 b1 = get_u8 ();
406 U8 b2 = get_u8 (); 437 U8 b2 = get_u8 ();
424 455
425 return res; 456 return res;
426} 457}
427 458
428static SV * 459static SV *
429decode_ber () 460decode_ber (void)
430{ 461{
431 int identifier = get_u8 (); 462 int identifier = get_u8 ();
432 463
433 SV *res; 464 SV *res;
434 465
437 int tag = identifier & ASN_TAG_MASK; 468 int tag = identifier & ASN_TAG_MASK;
438 469
439 if (tag == ASN_TAG_BER) 470 if (tag == ASN_TAG_BER)
440 tag = get_w (); 471 tag = get_w ();
441 472
442 if (tag == ASN_TAG_BER)
443 tag = get_w ();
444
445 if (constructed) 473 if (constructed)
446 { 474 {
447 U32 len = get_length (); 475 want (1);
448 U32 seqend = (cur - buf) + len;
449 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 476 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
450 477
451 while (cur < buf + seqend) 478 if (expect_false (*cur == 0x80))
479 {
480 // indefinite length
481 ++cur;
482
483 for (;;)
484 {
485 want (2);
486 if (!cur [0] && !cur [1])
487 {
488 cur += 2;
489 break;
490 }
491
452 av_push (av, decode_ber ()); 492 av_push (av, decode_ber ());
493 }
494 }
495 else
496 {
497 UV len = get_length ();
498 UV seqend = (cur - buf) + len;
453 499
454 if (cur > buf + seqend) 500 while (cur < buf + seqend)
501 av_push (av, decode_ber ());
502
503 if (expect_false (cur > buf + seqend))
455 croak ("constructed type %02x overflow (%x %x)\n", identifier, cur - buf, seqend); 504 croak ("CONSTRUCTED type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
505 }
456 506
457 res = newRV_inc ((SV *)av); 507 res = newRV_inc ((SV *)av);
458 } 508 }
459 else 509 else
510 {
511 UV len = get_length ();
512
460 switch (profile_lookup (cur_profile, klass, tag)) 513 switch (profile_lookup (cur_profile, klass, tag))
461 { 514 {
462 case BER_TYPE_NULL: 515 case BER_TYPE_NULL:
516 if (expect_false (len))
517 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
518
463 res = &PL_sv_undef; 519 res = &PL_sv_undef;
464 break; 520 break;
465 521
466 case BER_TYPE_BOOL: 522 case BER_TYPE_BOOL:
467 {
468 U32 len = get_length ();
469
470 if (len != 1) 523 if (expect_false (len != 1))
471 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len); 524 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
472 525
473 res = newSVcacheint (get_u8 () ? 0 : 1); 526 res = newSVcacheint (!!get_u8 ());
474 }
475 break; 527 break;
476 528
477 case BER_TYPE_OID: 529 case BER_TYPE_OID:
478 res = decode_oid (0); 530 res = decode_oid (len, 0);
479 break; 531 break;
480 532
481 case BER_TYPE_RELOID: 533 case BER_TYPE_RELOID:
482 res = decode_oid (1); 534 res = decode_oid (len, 1);
483 break; 535 break;
484 536
485 case BER_TYPE_INT: 537 case BER_TYPE_INT:
486 res = decode_int (); 538 res = decode_int (len);
487 break; 539 break;
488 540
489 case BER_TYPE_UTF8: 541 case BER_TYPE_UTF8:
490 res = decode_data (); 542 res = decode_data (len);
491 SvUTF8_on (res); 543 SvUTF8_on (res);
492 break; 544 break;
493 545
494 case BER_TYPE_BYTES: 546 case BER_TYPE_BYTES:
495 res = decode_data (); 547 res = decode_data (len);
496 break; 548 break;
497 549
498 case BER_TYPE_IPADDRESS: 550 case BER_TYPE_IPADDRESS:
499 { 551 {
500 U32 len = get_length ();
501
502 if (len != 4) 552 if (len != 4)
503 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 553 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
504 554
505 U8 c1 = get_u8 (); 555 U8 *data = get_n (4);
506 U8 c2 = get_u8 (); 556 res = newSVpvf ("%d.%d.%d.%d", data [0], data [1], data [2], data [3]);
507 U8 c3 = get_u8 ();
508 U8 c4 = get_u8 ();
509
510 res = newSVpvf ("%d.%d.%d.%d", c1, c2, c3, c4);
511 } 557 }
512 break; 558 break;
513 559
514 case BER_TYPE_UCS2: 560 case BER_TYPE_UCS2:
515 res = decode_ucs (2); 561 res = decode_ucs (len, 2);
516 break; 562 break;
517 563
518 case BER_TYPE_UCS4: 564 case BER_TYPE_UCS4:
519 res = decode_ucs (4); 565 res = decode_ucs (len, 4);
520 break; 566 break;
521 567
522 case BER_TYPE_REAL: 568 case BER_TYPE_REAL:
569 error ("BER_TYPE_REAL not implemented");
570
523 case BER_TYPE_CROAK: 571 case BER_TYPE_CROAK:
572 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
573
524 default: 574 default:
525 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 575 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
526 } 576 }
577 }
527 578
528 AV *av = newAV (); 579 AV *av = newAV ();
529 av_fill (av, BER_ARRAYSIZE - 1); 580 av_fill (av, BER_ARRAYSIZE - 1);
530 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 581 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
531 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 582 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
532 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 583 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
533 AvARRAY (av)[BER_DATA ] = res; 584 AvARRAY (av)[BER_DATA ] = res;
534 585
535 return newRV_noinc ((SV *)av); 586 return newRV_noinc ((SV *)av);
536} 587}
537 588
538///////////////////////////////////////////////////////////////////////////// 589/////////////////////////////////////////////////////////////////////////////
543strlen_sum (STRLEN l1, STRLEN l2) 594strlen_sum (STRLEN l1, STRLEN l2)
544{ 595{
545 size_t sum = l1 + l2; 596 size_t sum = l1 + l2;
546 597
547 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 598 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
548 croak ("JSON::XS: string size overflow"); 599 croak ("Convert::BER::XS: string size overflow");
549 600
550 return sum; 601 return sum;
551} 602}
552 603
553static void 604static void
554set_buf (SV *sv) 605set_buf (SV *sv)
555{ 606{
556 STRLEN len; 607 STRLEN len;
557 buf_sv = sv; 608 buf_sv = sv;
558 buf = SvPVbyte (buf_sv, len); 609 buf = (U8 *)SvPVbyte (buf_sv, len);
559 cur = buf; 610 cur = buf;
560 end = buf + len; 611 end = buf + len;
561} 612}
562 613
563/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */ 614/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
577need (STRLEN len) 628need (STRLEN len)
578{ 629{
579 if (expect_false ((uintptr_t)(end - cur) < len)) 630 if (expect_false ((uintptr_t)(end - cur) < len))
580 { 631 {
581 STRLEN pos = cur - buf; 632 STRLEN pos = cur - buf;
582 buf = my_sv_grow (buf_sv, pos, len); 633 buf = (U8 *)my_sv_grow (buf_sv, pos, len);
583 cur = buf + pos; 634 cur = buf + pos;
584 end = buf + SvLEN (buf_sv) - 1; 635 end = buf + SvLEN (buf_sv) - 1;
585 } 636 }
586} 637}
587 638
591 need (1); 642 need (1);
592 *cur++ = val; 643 *cur++ = val;
593} 644}
594 645
595static void 646static void
596put_w_nocheck (U32 val) 647put_w_nocheck (UV val)
597{ 648{
649#if UVSIZE > 4
650 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
651 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
652 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
653 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
654 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
655#endif
598 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 656 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
599 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 657 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
600 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 658 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
601 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 659 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
602 *cur = val & 0x7f; cur += 1; 660 *cur = val & 0x7f; cur += 1;
603} 661}
604 662
605static void 663static void
606put_w (U32 val) 664put_w (UV val)
607{ 665{
608 need (5); // we only handle up to 5 bytes 666 need (5); // we only handle up to 5 bytes
609 667
610 put_w_nocheck (val); 668 put_w_nocheck (val);
611} 669}
612 670
613static U8 * 671static U8 *
614put_length_at (U32 val, U8 *cur) 672put_length_at (UV val, U8 *cur)
615{ 673{
616 if (val < 0x7fU) 674 if (val <= 0x7fU)
617 *cur++ = val; 675 *cur++ = val;
618 else 676 else
619 { 677 {
620 U8 *lenb = cur++; 678 U8 *lenb = cur++;
621 679
622 *cur = val >> 24; cur += *cur > 0; 680#if UVSIZE > 4
623 *cur = val >> 16; cur += *cur > 0; 681 *cur = val >> 56; cur += val >= ((UV)1 << (8 * 7));
624 *cur = val >> 8; cur += *cur > 0; 682 *cur = val >> 48; cur += val >= ((UV)1 << (8 * 6));
683 *cur = val >> 40; cur += val >= ((UV)1 << (8 * 5));
684 *cur = val >> 32; cur += val >= ((UV)1 << (8 * 4));
685#endif
686 *cur = val >> 24; cur += val >= ((UV)1 << (8 * 3));
687 *cur = val >> 16; cur += val >= ((UV)1 << (8 * 2));
688 *cur = val >> 8; cur += val >= ((UV)1 << (8 * 1));
625 *cur = val ; cur += 1; 689 *cur = val ; cur += 1;
626 690
627 *lenb = 0x80 + cur - lenb - 1; 691 *lenb = 0x80 + cur - lenb - 1;
628 } 692 }
629 693
630 return cur; 694 return cur;
631} 695}
632 696
633static void 697static void
634put_length (U32 val) 698put_length (UV val)
635{ 699{
636 need (5 + val); 700 need (9 + val);
637 cur = put_length_at (val, cur); 701 cur = put_length_at (val, cur);
638} 702}
639 703
640// return how many bytes the encoded length requires 704// return how many bytes the encoded length requires
641static int length_length (U32 val) 705static int length_length (UV val)
642{ 706{
643 return val < 0x7fU 707 // use hashing with a DeBruin sequence, anyone?
708 return expect_true (val <= 0x7fU)
644 ? 1 709 ? 1
645 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 710 : 2
711 + (val > 0x000000000000ffU)
712 + (val > 0x0000000000ffffU)
713 + (val > 0x00000000ffffffU)
714#if UVSIZE > 4
715 + (val > 0x000000ffffffffU)
716 + (val > 0x0000ffffffffffU)
717 + (val > 0x00ffffffffffffU)
718 + (val > 0xffffffffffffffU)
719#endif
720 ;
646} 721}
647 722
648static void 723static void
649encode_data (const char *ptr, STRLEN len) 724encode_data (const char *ptr, STRLEN len)
650{ 725{
712 787
713 *lenb = cur - lenb - 1; 788 *lenb = cur - lenb - 1;
714} 789}
715 790
716// we don't know the length yet, so we optimistically 791// we don't know the length yet, so we optimistically
717// assume the length will need one octet later. if that 792// assume the length will need one octet later. If that
718// turns out to be wrong, we memove as needed. 793// turns out to be wrong, we memmove as needed.
719// mark the beginning 794// mark the beginning
720static STRLEN 795static STRLEN
721len_fixup_mark () 796len_fixup_mark (void)
722{ 797{
723 return cur++ - buf; 798 return cur++ - buf;
724} 799}
725 800
726// patch up the length 801// patch up the length
813 put_length (uchars * chrsize); 888 put_length (uchars * chrsize);
814 889
815 while (uchars--) 890 while (uchars--)
816 { 891 {
817 STRLEN uclen; 892 STRLEN uclen;
818 UV uchr = utf8_to_uvchr_buf (ptr, ptr + len, &uclen); 893 UV uchr = utf8_to_uvchr_buf ((U8 *)ptr, (U8 *)ptr + len, &uclen);
819 894
820 ptr += uclen; 895 ptr += uclen;
821 len -= uclen; 896 len -= uclen;
822 897
823 if (chrsize == 4) 898 if (chrsize == 4)
835{ 910{
836 AV *av = ber_tuple (tuple); 911 AV *av = ber_tuple (tuple);
837 912
838 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 913 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
839 int tag = SvIV (AvARRAY (av)[BER_TAG]); 914 int tag = SvIV (AvARRAY (av)[BER_TAG]);
840 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 915 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
841 SV *data = AvARRAY (av)[BER_DATA]; 916 SV *data = AvARRAY (av)[BER_DATA];
842 917
843 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 918 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
844 919
845 if (expect_false (tag >= ASN_TAG_BER)) 920 if (expect_false (tag >= ASN_TAG_BER))
856 // and adjust later 931 // and adjust later
857 need (1); 932 need (1);
858 STRLEN mark = len_fixup_mark (); 933 STRLEN mark = len_fixup_mark ();
859 934
860 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV)) 935 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV))
861 croak ("BER constructed data must be array-reference"); 936 croak ("BER CONSTRUCTED data must be array-reference");
862 937
863 AV *av = (AV *)SvRV (data); 938 AV *av = (AV *)SvRV (data);
864 int fill = AvFILL (av); 939 int fill = AvFILL (av);
865 940
866 if (expect_false (SvRMAGICAL (av))) 941 if (expect_false (SvRMAGICAL (av)))
867 croak ("BER constructed data must not be tied"); 942 croak ("BER CONSTRUCTED data must not be tied");
868 943
944 int i;
869 for (int i = 0; i <= fill; ++i) 945 for (i = 0; i <= fill; ++i)
870 encode_ber (AvARRAY (av)[i]); 946 encode_ber (AvARRAY (av)[i]);
871 947
872 len_fixup (mark); 948 len_fixup (mark);
873 } 949 }
874 else 950 else
878 put_length (0); 954 put_length (0);
879 break; 955 break;
880 956
881 case BER_TYPE_BOOL: 957 case BER_TYPE_BOOL:
882 put_length (1); 958 put_length (1);
883 *cur++ = SvTRUE (data) ? 0xff : 0x00; 959 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
884 break; 960 break;
885 961
886 case BER_TYPE_OID: 962 case BER_TYPE_OID:
887 encode_oid (data, 0); 963 encode_oid (data, 0);
888 break; 964 break;
926 case BER_TYPE_UCS4: 1002 case BER_TYPE_UCS4:
927 encode_ucs (data, 4); 1003 encode_ucs (data, 4);
928 break; 1004 break;
929 1005
930 case BER_TYPE_REAL: 1006 case BER_TYPE_REAL:
1007 croak ("BER_TYPE_REAL not implemented");
1008
931 case BER_TYPE_CROAK: 1009 case BER_TYPE_CROAK:
1010 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
1011
932 default: 1012 default:
933 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 1013 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
934 } 1014 }
935 1015
936} 1016}
951 const char *name; 1031 const char *name;
952 IV iv; 1032 IV iv;
953 } *civ, const_iv[] = { 1033 } *civ, const_iv[] = {
954#define const_iv(name) { # name, name }, 1034#define const_iv(name) { # name, name },
955 const_iv (ASN_BOOLEAN) 1035 const_iv (ASN_BOOLEAN)
956 const_iv (ASN_INTEGER32) 1036 const_iv (ASN_INTEGER)
957 const_iv (ASN_BIT_STRING) 1037 const_iv (ASN_BIT_STRING)
958 const_iv (ASN_OCTET_STRING) 1038 const_iv (ASN_OCTET_STRING)
959 const_iv (ASN_NULL) 1039 const_iv (ASN_NULL)
960 const_iv (ASN_OBJECT_IDENTIFIER) 1040 const_iv (ASN_OBJECT_IDENTIFIER)
961 const_iv (ASN_OBJECT_DESCRIPTOR) 1041 const_iv (ASN_OBJECT_DESCRIPTOR)
990 const_iv (ASN_CONTEXT) 1070 const_iv (ASN_CONTEXT)
991 const_iv (ASN_PRIVATE) 1071 const_iv (ASN_PRIVATE)
992 1072
993 const_iv (BER_CLASS) 1073 const_iv (BER_CLASS)
994 const_iv (BER_TAG) 1074 const_iv (BER_TAG)
995 const_iv (BER_CONSTRUCTED) 1075 const_iv (BER_FLAGS)
996 const_iv (BER_DATA) 1076 const_iv (BER_DATA)
997 1077
998 const_iv (BER_TYPE_BYTES) 1078 const_iv (BER_TYPE_BYTES)
999 const_iv (BER_TYPE_UTF8) 1079 const_iv (BER_TYPE_UTF8)
1000 const_iv (BER_TYPE_UCS2) 1080 const_iv (BER_TYPE_UCS2)
1008 const_iv (BER_TYPE_IPADDRESS) 1088 const_iv (BER_TYPE_IPADDRESS)
1009 const_iv (BER_TYPE_CROAK) 1089 const_iv (BER_TYPE_CROAK)
1010 1090
1011 const_iv (SNMP_IPADDRESS) 1091 const_iv (SNMP_IPADDRESS)
1012 const_iv (SNMP_COUNTER32) 1092 const_iv (SNMP_COUNTER32)
1093 const_iv (SNMP_GAUGE32)
1013 const_iv (SNMP_UNSIGNED32) 1094 const_iv (SNMP_UNSIGNED32)
1014 const_iv (SNMP_TIMETICKS) 1095 const_iv (SNMP_TIMETICKS)
1015 const_iv (SNMP_OPAQUE) 1096 const_iv (SNMP_OPAQUE)
1016 const_iv (SNMP_COUNTER64) 1097 const_iv (SNMP_COUNTER64)
1017 }; 1098 };
1018 1099
1019 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) 1100 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
1020 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1101 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1021} 1102}
1022 1103
1023SV * 1104void
1024ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1105ber_decode (SV *ber, SV *profile = &PL_sv_undef)
1106 ALIAS:
1107 ber_decode_prefix = 1
1025 CODE: 1108 PPCODE:
1026{ 1109{
1027 cur_profile = SvPROFILE (profile); 1110 cur_profile = SvPROFILE (profile);
1028 STRLEN len; 1111 STRLEN len;
1029 buf = SvPVbyte (ber, len); 1112 buf = (U8 *)SvPVbyte (ber, len);
1030 cur = buf; 1113 cur = buf;
1031 end = buf + len; 1114 end = buf + len;
1032 1115
1033 RETVAL = decode_ber (); 1116 SV *tuple = decode_ber ();
1117
1118 EXTEND (SP, 2);
1119 PUSHs (sv_2mortal (tuple));
1120
1121 if (ix)
1122 PUSHs (sv_2mortal (newSViv (cur - buf)));
1123 else if (cur != end)
1124 error ("trailing garbage after BER value");
1034} 1125}
1035 OUTPUT: RETVAL
1036 1126
1037void 1127void
1038ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &PL_sv_undef, SV *data = &PL_sv_undef) 1128ber_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: 1129 PPCODE:
1040{ 1130{
1041 if (!SvOK (tuple)) 1131 if (!SvOK (tuple))
1042 XSRETURN_NO; 1132 XSRETURN_NO;
1043 1133
1045 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1135 croak ("ber_is: tuple must be BER tuple (array-ref)");
1046 1136
1047 AV *av = (AV *)SvRV (tuple); 1137 AV *av = (AV *)SvRV (tuple);
1048 1138
1049 XPUSHs ( 1139 XPUSHs (
1050 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1140 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1051 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1141 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1052 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1142 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1053 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1143 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1054 ? &PL_sv_yes : &PL_sv_undef); 1144 ? &PL_sv_yes : &PL_sv_undef);
1055} 1145}
1056 1146
1057void 1147void
1058ber_is_seq (SV *tuple) 1148ber_is_seq (SV *tuple)
1062 XSRETURN_UNDEF; 1152 XSRETURN_UNDEF;
1063 1153
1064 AV *av = ber_tuple (tuple); 1154 AV *av = ber_tuple (tuple);
1065 1155
1066 XPUSHs ( 1156 XPUSHs (
1067 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1157 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1068 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1158 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1069 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1159 && SvIV (AvARRAY (av)[BER_FLAGS])
1070 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1160 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1071} 1161}
1072 1162
1073void 1163void
1074ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1164ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1075 PPCODE: 1165 PPCODE:
1076{ 1166{
1077 if (!SvOK (tuple)) 1167 if (!SvOK (tuple))
1078 XSRETURN_NO; 1168 XSRETURN_NO;
1079 1169
1080 AV *av = ber_tuple (tuple); 1170 AV *av = ber_tuple (tuple);
1081 1171
1082 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1172 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1083 1173
1084 XPUSHs ( 1174 XPUSHs (
1085 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1175 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1086 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1176 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1087 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1177 && !SvIV (AvARRAY (av)[BER_FLAGS])
1088 && (!SvOK (value) || data == SvIV (value)) 1178 && (!SvOK (value) || data == SvUV (value))
1089 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1179 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1090 : &PL_sv_undef); 1180 : &PL_sv_undef);
1091} 1181}
1092 1182
1093void 1183void
1094ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1184ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
1098 XSRETURN_NO; 1188 XSRETURN_NO;
1099 1189
1100 AV *av = ber_tuple (tuple); 1190 AV *av = ber_tuple (tuple);
1101 1191
1102 XPUSHs ( 1192 XPUSHs (
1103 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1193 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1104 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1194 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1105 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1195 && !SvIV (AvARRAY (av)[BER_FLAGS])
1106 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1196 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1107 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1197 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1108} 1198}
1109 1199
1110############################################################################# 1200#############################################################################
1123 SvCUR_set (buf_sv, cur - buf); 1213 SvCUR_set (buf_sv, cur - buf);
1124 XPUSHs (buf_sv); 1214 XPUSHs (buf_sv);
1125} 1215}
1126 1216
1127SV * 1217SV *
1128ber_i32 (IV iv) 1218ber_int (SV *sv)
1129 CODE: 1219 CODE:
1130{ 1220{
1131 AV *av = newAV (); 1221 AV *av = newAV ();
1132 av_fill (av, BER_ARRAYSIZE - 1); 1222 av_fill (av, BER_ARRAYSIZE - 1);
1133 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1223 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1134 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1224 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1135 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1225 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1136 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1226 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1137 RETVAL = newRV_noinc ((SV *)av); 1227 RETVAL = newRV_noinc ((SV *)av);
1138} 1228}
1139 OUTPUT: RETVAL 1229 OUTPUT: RETVAL
1140 1230
1141# TODO: not arrayref, but elements? 1231# TODO: not arrayref, but elements?
1143ber_seq (SV *arrayref) 1233ber_seq (SV *arrayref)
1144 CODE: 1234 CODE:
1145{ 1235{
1146 AV *av = newAV (); 1236 AV *av = newAV ();
1147 av_fill (av, BER_ARRAYSIZE - 1); 1237 av_fill (av, BER_ARRAYSIZE - 1);
1148 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1238 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1149 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1239 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1150 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1240 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1151 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1241 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1152 RETVAL = newRV_noinc ((SV *)av); 1242 RETVAL = newRV_noinc ((SV *)av);
1153} 1243}
1154 OUTPUT: RETVAL 1244 OUTPUT: RETVAL
1155 1245
1156MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1246MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines