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.30 by root, Tue Apr 23 20:03:08 2019 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5// C99 required 5// C99 required!
6// this is not just for comments, but also for
7// integer constant semantics,
8// sscanf format modifiers and more.
6 9
7enum { 10enum {
8 // ASN_TAG 11 // ASN_TAG
9 ASN_BOOLEAN = 0x01, 12 ASN_BOOLEAN = 0x01,
10 ASN_INTEGER32 = 0x02, 13 ASN_INTEGER = 0x02,
11 ASN_BIT_STRING = 0x03, 14 ASN_BIT_STRING = 0x03,
12 ASN_OCTET_STRING = 0x04, 15 ASN_OCTET_STRING = 0x04,
13 ASN_NULL = 0x05, 16 ASN_NULL = 0x05,
14 ASN_OBJECT_IDENTIFIER = 0x06, 17 ASN_OBJECT_IDENTIFIER = 0x06,
15 ASN_OID = 0x06, //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 ("indefinite BER value lengths not supported");
294
295 if (expect_false (cnt > UVSIZE))
296 error ("BER value length too long (must fit into UV) or BER reserved value in length (X.690 8.1.3.5)");
297
298 want (cnt);
299
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
425// TODO: this is unacceptably slow
392static SV * 426static SV *
427decode_ucs (UV len, int chrsize)
428{
429 if (len & (chrsize - 1))
430 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
431
432 SV *res = NEWSV (0, 0);
433
434 while (len)
435 {
436 U8 b1 = get_u8 ();
437 U8 b2 = get_u8 ();
438 U32 chr = (b1 << 8) | b2;
439
440 if (chrsize == 4)
441 {
442 U8 b3 = get_u8 ();
443 U8 b4 = get_u8 ();
444 chr = (chr << 16) | (b3 << 8) | b4;
445 }
446
447 U8 uchr [UTF8_MAXBYTES];
448 int uclen = uvuni_to_utf8 (uchr, chr) - uchr;
449
450 sv_catpvn (res, (const char *)uchr, uclen);
451 len -= chrsize;
452 }
453
454 SvUTF8_on (res);
455
456 return res;
457}
458
459static SV *
393decode_ber () 460decode_ber (void)
394{ 461{
395 int identifier = get_u8 (); 462 int identifier = get_u8 ();
396 463
397 SV *res; 464 SV *res;
398 465
401 int tag = identifier & ASN_TAG_MASK; 468 int tag = identifier & ASN_TAG_MASK;
402 469
403 if (tag == ASN_TAG_BER) 470 if (tag == ASN_TAG_BER)
404 tag = get_w (); 471 tag = get_w ();
405 472
406 if (tag == ASN_TAG_BER)
407 tag = get_w ();
408
409 if (constructed) 473 if (constructed)
410 { 474 {
411 U32 len = get_length (); 475 UV len = get_length ();
412 U32 seqend = (cur - buf) + len; 476 UV seqend = (cur - buf) + len;
413 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 477 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
414 478
415 while (cur < buf + seqend) 479 while (cur < buf + seqend)
416 av_push (av, decode_ber ()); 480 av_push (av, decode_ber ());
417 481
418 if (cur > buf + seqend) 482 if (expect_false (cur > buf + seqend))
419 croak ("constructed type %02x overflow (%x %x)\n", identifier, cur - buf, seqend); 483 croak ("CONSTRUCTED type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
420 484
421 res = newRV_inc ((SV *)av); 485 res = newRV_inc ((SV *)av);
422 } 486 }
423 else 487 else
488 {
489 UV len = get_length ();
490
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 if (expect_false (len))
495 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
496
427 res = &PL_sv_undef; 497 res = &PL_sv_undef;
428 break; 498 break;
429 499
430 case BER_TYPE_BOOL: 500 case BER_TYPE_BOOL:
431 {
432 U32 len = get_length ();
433
434 if (len != 1) 501 if (expect_false (len != 1))
435 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len); 502 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
436 503
437 res = newSVcacheint (get_u8 () ? 0 : 1); 504 res = newSVcacheint (!!get_u8 ());
438 }
439 break; 505 break;
440 506
441 case BER_TYPE_OID: 507 case BER_TYPE_OID:
442 res = decode_oid (0); 508 res = decode_oid (len, 0);
443 break; 509 break;
444 510
445 case BER_TYPE_RELOID: 511 case BER_TYPE_RELOID:
446 res = decode_oid (1); 512 res = decode_oid (len, 1);
447 break; 513 break;
448 514
449 case BER_TYPE_INT: 515 case BER_TYPE_INT:
450 res = decode_int (); 516 res = decode_int (len);
451 break; 517 break;
452 518
453 case BER_TYPE_UTF8: 519 case BER_TYPE_UTF8:
454 res = decode_data (); 520 res = decode_data (len);
455 SvUTF8_on (res); 521 SvUTF8_on (res);
456 break; 522 break;
457 523
458 case BER_TYPE_BYTES: 524 case BER_TYPE_BYTES:
459 res = decode_data (); 525 res = decode_data (len);
460 break; 526 break;
461 527
462 case BER_TYPE_IPADDRESS: 528 case BER_TYPE_IPADDRESS:
463 { 529 {
464 U32 len = get_length ();
465
466 if (len != 4) 530 if (len != 4)
467 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 531 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
468 532
469 U8 c1 = get_u8 (); 533 U8 *data = get_n (4);
470 U8 c2 = get_u8 (); 534 res = newSVpvf ("%d.%d.%d.%d", data [0], data [1], data [2], data [3]);
471 U8 c3 = get_u8 ();
472 U8 c4 = get_u8 ();
473
474 res = newSVpvf ("%d.%d.%d.%d", c1, c2, c3, c4);
475 } 535 }
476 break; 536 break;
477 537
478 case BER_TYPE_REAL:
479 case BER_TYPE_UCS2: 538 case BER_TYPE_UCS2:
539 res = decode_ucs (len, 2);
540 break;
541
480 case BER_TYPE_UCS4: 542 case BER_TYPE_UCS4:
543 res = decode_ucs (len, 4);
544 break;
545
546 case BER_TYPE_REAL:
547 error ("BER_TYPE_REAL not implemented");
548
481 case BER_TYPE_CROAK: 549 case BER_TYPE_CROAK:
550 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
551
482 default: 552 default:
483 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 553 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
484 } 554 }
555 }
485 556
486 AV *av = newAV (); 557 AV *av = newAV ();
487 av_fill (av, BER_ARRAYSIZE - 1); 558 av_fill (av, BER_ARRAYSIZE - 1);
488 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 559 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
489 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 560 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
490 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 561 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
491 AvARRAY (av)[BER_DATA ] = res; 562 AvARRAY (av)[BER_DATA ] = res;
492 563
493 return newRV_noinc ((SV *)av); 564 return newRV_noinc ((SV *)av);
494} 565}
495 566
496///////////////////////////////////////////////////////////////////////////// 567/////////////////////////////////////////////////////////////////////////////
501strlen_sum (STRLEN l1, STRLEN l2) 572strlen_sum (STRLEN l1, STRLEN l2)
502{ 573{
503 size_t sum = l1 + l2; 574 size_t sum = l1 + l2;
504 575
505 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 576 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
506 croak ("JSON::XS: string size overflow"); 577 croak ("Convert::BER::XS: string size overflow");
507 578
508 return sum; 579 return sum;
509} 580}
510 581
511static void 582static void
512set_buf (SV *sv) 583set_buf (SV *sv)
513{ 584{
514 STRLEN len; 585 STRLEN len;
515 buf_sv = sv; 586 buf_sv = sv;
516 buf = SvPVbyte (buf_sv, len); 587 buf = (U8 *)SvPVbyte (buf_sv, len);
517 cur = buf; 588 cur = buf;
518 end = buf + len; 589 end = buf + len;
519} 590}
520 591
521/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */ 592/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
535need (STRLEN len) 606need (STRLEN len)
536{ 607{
537 if (expect_false ((uintptr_t)(end - cur) < len)) 608 if (expect_false ((uintptr_t)(end - cur) < len))
538 { 609 {
539 STRLEN pos = cur - buf; 610 STRLEN pos = cur - buf;
540 buf = my_sv_grow (buf_sv, pos, len); 611 buf = (U8 *)my_sv_grow (buf_sv, pos, len);
541 cur = buf + pos; 612 cur = buf + pos;
542 end = buf + SvLEN (buf_sv) - 1; 613 end = buf + SvLEN (buf_sv) - 1;
543 } 614 }
544} 615}
545 616
549 need (1); 620 need (1);
550 *cur++ = val; 621 *cur++ = val;
551} 622}
552 623
553static void 624static void
554put_w_nocheck (U32 val) 625put_w_nocheck (UV val)
555{ 626{
627#if UVSIZE > 4
628 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
629 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
630 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
631 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
632 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
633#endif
556 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 634 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
557 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 635 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
558 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 636 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
559 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 637 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
560 *cur = val & 0x7f; cur += 1; 638 *cur = val & 0x7f; cur += 1;
561} 639}
562 640
563static void 641static void
564put_w (U32 val) 642put_w (UV val)
565{ 643{
566 need (5); // we only handle up to 5 bytes 644 need (5); // we only handle up to 5 bytes
567 645
568 put_w_nocheck (val); 646 put_w_nocheck (val);
569} 647}
570 648
571static U8 * 649static U8 *
572put_length_at (U32 val, U8 *cur) 650put_length_at (UV val, U8 *cur)
573{ 651{
574 if (val < 0x7fU) 652 if (val <= 0x7fU)
575 *cur++ = val; 653 *cur++ = val;
576 else 654 else
577 { 655 {
578 U8 *lenb = cur++; 656 U8 *lenb = cur++;
579 657
580 *cur = val >> 24; cur += *cur > 0; 658#if UVSIZE > 4
581 *cur = val >> 16; cur += *cur > 0; 659 *cur = val >> 56; cur += val >= ((UV)1 << (8 * 7));
582 *cur = val >> 8; cur += *cur > 0; 660 *cur = val >> 48; cur += val >= ((UV)1 << (8 * 6));
661 *cur = val >> 40; cur += val >= ((UV)1 << (8 * 5));
662 *cur = val >> 32; cur += val >= ((UV)1 << (8 * 4));
663#endif
664 *cur = val >> 24; cur += val >= ((UV)1 << (8 * 3));
665 *cur = val >> 16; cur += val >= ((UV)1 << (8 * 2));
666 *cur = val >> 8; cur += val >= ((UV)1 << (8 * 1));
583 *cur = val ; cur += 1; 667 *cur = val ; cur += 1;
584 668
585 *lenb = 0x80 + cur - lenb - 1; 669 *lenb = 0x80 + cur - lenb - 1;
586 } 670 }
587 671
588 return cur; 672 return cur;
589} 673}
590 674
591static void 675static void
592put_length (U32 val) 676put_length (UV val)
593{ 677{
594 need (5); 678 need (9 + val);
595 cur = put_length_at (val, cur); 679 cur = put_length_at (val, cur);
596} 680}
597 681
598// return how many bytes the encoded length requires 682// return how many bytes the encoded length requires
599static int length_length (U32 val) 683static int length_length (UV val)
600{ 684{
601 return val < 0x7fU 685 // use hashing with a DeBruin sequence, anyone?
686 return expect_true (val <= 0x7fU)
602 ? 1 687 ? 1
603 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 688 : 2
689 + (val > 0x000000000000ffU)
690 + (val > 0x0000000000ffffU)
691 + (val > 0x00000000ffffffU)
692#if UVSIZE > 4
693 + (val > 0x000000ffffffffU)
694 + (val > 0x0000ffffffffffU)
695 + (val > 0x00ffffffffffffU)
696 + (val > 0xffffffffffffffU)
697#endif
698 ;
604} 699}
605 700
606static void 701static void
607encode_data (const char *ptr, STRLEN len) 702encode_data (const char *ptr, STRLEN len)
608{ 703{
609 put_length (len); 704 put_length (len);
610 need (len);
611 memcpy (cur, ptr, len); 705 memcpy (cur, ptr, len);
612 cur += len; 706 cur += len;
613} 707}
614 708
615static void 709static void
671 765
672 *lenb = cur - lenb - 1; 766 *lenb = cur - lenb - 1;
673} 767}
674 768
675// we don't know the length yet, so we optimistically 769// we don't know the length yet, so we optimistically
676// assume the length will need one octet later. if that 770// assume the length will need one octet later. If that
677// turns out to be wrong, we memove as needed. 771// turns out to be wrong, we memmove as needed.
678// mark the beginning 772// mark the beginning
679static STRLEN 773static STRLEN
680len_fixup_mark () 774len_fixup_mark (void)
681{ 775{
682 return cur++ - buf; 776 return cur++ - buf;
683} 777}
684 778
685// patch up the length 779// patch up the length
761 855
762 return (AV *)rv; 856 return (AV *)rv;
763} 857}
764 858
765static void 859static void
860encode_ucs (SV *data, int chrsize)
861{
862 STRLEN uchars = sv_len_utf8 (data);
863 STRLEN len;;
864 char *ptr = SvPVutf8 (data, len);
865
866 put_length (uchars * chrsize);
867
868 while (uchars--)
869 {
870 STRLEN uclen;
871 UV uchr = utf8_to_uvchr_buf ((U8 *)ptr, (U8 *)ptr + len, &uclen);
872
873 ptr += uclen;
874 len -= uclen;
875
876 if (chrsize == 4)
877 {
878 *cur++ = uchr >> 24;
879 *cur++ = uchr >> 16;
880 }
881
882 *cur++ = uchr >> 8;
883 *cur++ = uchr;
884 }
885}
886static void
766encode_ber (SV *tuple) 887encode_ber (SV *tuple)
767{ 888{
768 AV *av = ber_tuple (tuple); 889 AV *av = ber_tuple (tuple);
769 890
770 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 891 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
771 int tag = SvIV (AvARRAY (av)[BER_TAG]); 892 int tag = SvIV (AvARRAY (av)[BER_TAG]);
772 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 893 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
773 SV *data = AvARRAY (av)[BER_DATA]; 894 SV *data = AvARRAY (av)[BER_DATA];
774 895
775 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 896 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
776 897
777 if (expect_false (tag >= ASN_TAG_BER)) 898 if (expect_false (tag >= ASN_TAG_BER))
788 // and adjust later 909 // and adjust later
789 need (1); 910 need (1);
790 STRLEN mark = len_fixup_mark (); 911 STRLEN mark = len_fixup_mark ();
791 912
792 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV)) 913 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV))
793 croak ("BER constructed data must be array-reference"); 914 croak ("BER CONSTRUCTED data must be array-reference");
794 915
795 AV *av = (AV *)SvRV (data); 916 AV *av = (AV *)SvRV (data);
796 int fill = AvFILL (av); 917 int fill = AvFILL (av);
797 918
798 if (expect_false (SvRMAGICAL (av))) 919 if (expect_false (SvRMAGICAL (av)))
799 croak ("BER constructed data must not be tied"); 920 croak ("BER CONSTRUCTED data must not be tied");
800 921
922 int i;
801 for (int i = 0; i <= fill; ++i) 923 for (i = 0; i <= fill; ++i)
802 encode_ber (AvARRAY (av)[i]); 924 encode_ber (AvARRAY (av)[i]);
803 925
804 len_fixup (mark); 926 len_fixup (mark);
805 } 927 }
806 else 928 else
810 put_length (0); 932 put_length (0);
811 break; 933 break;
812 934
813 case BER_TYPE_BOOL: 935 case BER_TYPE_BOOL:
814 put_length (1); 936 put_length (1);
815 put_u8 (SvTRUE (data) ? 0xff : 0x00); 937 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
816 break; 938 break;
817 939
818 case BER_TYPE_OID: 940 case BER_TYPE_OID:
819 encode_oid (data, 0); 941 encode_oid (data, 0);
820 break; 942 break;
849 sscanf (SvPV_nolen (data), "%hhu.%hhu.%hhu.%hhu", ip + 0, ip + 1, ip + 2, ip + 3); 971 sscanf (SvPV_nolen (data), "%hhu.%hhu.%hhu.%hhu", ip + 0, ip + 1, ip + 2, ip + 3);
850 encode_data ((const char *)ip, sizeof (ip)); 972 encode_data ((const char *)ip, sizeof (ip));
851 } 973 }
852 break; 974 break;
853 975
976 case BER_TYPE_UCS2:
977 encode_ucs (data, 2);
978 break;
979
980 case BER_TYPE_UCS4:
981 encode_ucs (data, 4);
982 break;
983
854 case BER_TYPE_REAL: 984 case BER_TYPE_REAL:
855 case BER_TYPE_UCS2: 985 croak ("BER_TYPE_REAL not implemented");
856 case BER_TYPE_UCS4: 986
857 case BER_TYPE_CROAK: 987 case BER_TYPE_CROAK:
988 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
989
858 default: 990 default:
859 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 991 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
860 } 992 }
861 993
862} 994}
877 const char *name; 1009 const char *name;
878 IV iv; 1010 IV iv;
879 } *civ, const_iv[] = { 1011 } *civ, const_iv[] = {
880#define const_iv(name) { # name, name }, 1012#define const_iv(name) { # name, name },
881 const_iv (ASN_BOOLEAN) 1013 const_iv (ASN_BOOLEAN)
882 const_iv (ASN_INTEGER32) 1014 const_iv (ASN_INTEGER)
883 const_iv (ASN_BIT_STRING) 1015 const_iv (ASN_BIT_STRING)
884 const_iv (ASN_OCTET_STRING) 1016 const_iv (ASN_OCTET_STRING)
885 const_iv (ASN_NULL) 1017 const_iv (ASN_NULL)
886 const_iv (ASN_OBJECT_IDENTIFIER) 1018 const_iv (ASN_OBJECT_IDENTIFIER)
887 const_iv (ASN_OBJECT_DESCRIPTOR) 1019 const_iv (ASN_OBJECT_DESCRIPTOR)
916 const_iv (ASN_CONTEXT) 1048 const_iv (ASN_CONTEXT)
917 const_iv (ASN_PRIVATE) 1049 const_iv (ASN_PRIVATE)
918 1050
919 const_iv (BER_CLASS) 1051 const_iv (BER_CLASS)
920 const_iv (BER_TAG) 1052 const_iv (BER_TAG)
921 const_iv (BER_CONSTRUCTED) 1053 const_iv (BER_FLAGS)
922 const_iv (BER_DATA) 1054 const_iv (BER_DATA)
923 1055
924 const_iv (BER_TYPE_BYTES) 1056 const_iv (BER_TYPE_BYTES)
925 const_iv (BER_TYPE_UTF8) 1057 const_iv (BER_TYPE_UTF8)
926 const_iv (BER_TYPE_UCS2) 1058 const_iv (BER_TYPE_UCS2)
934 const_iv (BER_TYPE_IPADDRESS) 1066 const_iv (BER_TYPE_IPADDRESS)
935 const_iv (BER_TYPE_CROAK) 1067 const_iv (BER_TYPE_CROAK)
936 1068
937 const_iv (SNMP_IPADDRESS) 1069 const_iv (SNMP_IPADDRESS)
938 const_iv (SNMP_COUNTER32) 1070 const_iv (SNMP_COUNTER32)
1071 const_iv (SNMP_GAUGE32)
939 const_iv (SNMP_UNSIGNED32) 1072 const_iv (SNMP_UNSIGNED32)
940 const_iv (SNMP_TIMETICKS) 1073 const_iv (SNMP_TIMETICKS)
941 const_iv (SNMP_OPAQUE) 1074 const_iv (SNMP_OPAQUE)
942 const_iv (SNMP_COUNTER64) 1075 const_iv (SNMP_COUNTER64)
943 }; 1076 };
944 1077
945 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) 1078 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
946 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1079 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
947} 1080}
948 1081
949SV * 1082void
950ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1083ber_decode (SV *ber, SV *profile = &PL_sv_undef)
1084 ALIAS:
1085 ber_decode_prefix = 1
951 CODE: 1086 PPCODE:
952{ 1087{
953 cur_profile = SvPROFILE (profile); 1088 cur_profile = SvPROFILE (profile);
954 STRLEN len; 1089 STRLEN len;
955 buf = SvPVbyte (ber, len); 1090 buf = (U8 *)SvPVbyte (ber, len);
956 cur = buf; 1091 cur = buf;
957 end = buf + len; 1092 end = buf + len;
958 1093
959 RETVAL = decode_ber (); 1094 SV *tuple = decode_ber ();
1095
1096 EXTEND (SP, 2);
1097 PUSHs (sv_2mortal (tuple));
1098
1099 if (ix)
1100 PUSHs (sv_2mortal (newSViv (cur - buf)));
1101 else if (cur != end)
1102 error ("trailing garbage after BER value");
960} 1103}
961 OUTPUT: RETVAL
962 1104
963void 1105void
964ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &PL_sv_undef, SV *data = &PL_sv_undef) 1106ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *flags = &PL_sv_undef, SV *data = &PL_sv_undef)
965 PPCODE: 1107 PPCODE:
966{ 1108{
967 if (!SvOK (tuple)) 1109 if (!SvOK (tuple))
968 XSRETURN_NO; 1110 XSRETURN_NO;
969 1111
971 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1113 croak ("ber_is: tuple must be BER tuple (array-ref)");
972 1114
973 AV *av = (AV *)SvRV (tuple); 1115 AV *av = (AV *)SvRV (tuple);
974 1116
975 XPUSHs ( 1117 XPUSHs (
976 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1118 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
977 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1119 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
978 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1120 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
979 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1121 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
980 ? &PL_sv_yes : &PL_sv_undef); 1122 ? &PL_sv_yes : &PL_sv_undef);
981} 1123}
982 1124
983void 1125void
984ber_is_seq (SV *tuple) 1126ber_is_seq (SV *tuple)
988 XSRETURN_UNDEF; 1130 XSRETURN_UNDEF;
989 1131
990 AV *av = ber_tuple (tuple); 1132 AV *av = ber_tuple (tuple);
991 1133
992 XPUSHs ( 1134 XPUSHs (
993 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1135 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
994 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1136 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
995 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1137 && SvIV (AvARRAY (av)[BER_FLAGS])
996 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1138 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
997} 1139}
998 1140
999void 1141void
1000ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1142ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1001 PPCODE: 1143 PPCODE:
1002{ 1144{
1003 if (!SvOK (tuple)) 1145 if (!SvOK (tuple))
1004 XSRETURN_NO; 1146 XSRETURN_NO;
1005 1147
1006 AV *av = ber_tuple (tuple); 1148 AV *av = ber_tuple (tuple);
1007 1149
1008 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1150 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1009 1151
1010 XPUSHs ( 1152 XPUSHs (
1011 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1153 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1012 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1154 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1013 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1155 && !SvIV (AvARRAY (av)[BER_FLAGS])
1014 && (!SvOK (value) || data == SvIV (value)) 1156 && (!SvOK (value) || data == SvUV (value))
1015 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1157 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1016 : &PL_sv_undef); 1158 : &PL_sv_undef);
1017} 1159}
1018 1160
1019void 1161void
1020ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1162ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
1024 XSRETURN_NO; 1166 XSRETURN_NO;
1025 1167
1026 AV *av = ber_tuple (tuple); 1168 AV *av = ber_tuple (tuple);
1027 1169
1028 XPUSHs ( 1170 XPUSHs (
1029 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1171 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1030 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1172 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1031 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1173 && !SvIV (AvARRAY (av)[BER_FLAGS])
1032 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1174 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1033 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1175 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1034} 1176}
1035 1177
1036############################################################################# 1178#############################################################################
1049 SvCUR_set (buf_sv, cur - buf); 1191 SvCUR_set (buf_sv, cur - buf);
1050 XPUSHs (buf_sv); 1192 XPUSHs (buf_sv);
1051} 1193}
1052 1194
1053SV * 1195SV *
1054ber_i32 (IV iv) 1196ber_int (SV *sv)
1055 CODE: 1197 CODE:
1056{ 1198{
1057 AV *av = newAV (); 1199 AV *av = newAV ();
1058 av_fill (av, BER_ARRAYSIZE - 1); 1200 av_fill (av, BER_ARRAYSIZE - 1);
1059 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1201 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1060 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1202 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1061 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1203 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1062 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1204 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1063 RETVAL = newRV_noinc ((SV *)av); 1205 RETVAL = newRV_noinc ((SV *)av);
1064} 1206}
1065 OUTPUT: RETVAL 1207 OUTPUT: RETVAL
1066 1208
1067# TODO: not arrayref, but elements? 1209# TODO: not arrayref, but elements?
1069ber_seq (SV *arrayref) 1211ber_seq (SV *arrayref)
1070 CODE: 1212 CODE:
1071{ 1213{
1072 AV *av = newAV (); 1214 AV *av = newAV ();
1073 av_fill (av, BER_ARRAYSIZE - 1); 1215 av_fill (av, BER_ARRAYSIZE - 1);
1074 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1216 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1075 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1217 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1076 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1218 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1077 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1219 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1078 RETVAL = newRV_noinc ((SV *)av); 1220 RETVAL = newRV_noinc ((SV *)av);
1079} 1221}
1080 OUTPUT: RETVAL 1222 OUTPUT: RETVAL
1081 1223
1082MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1224MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines