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.12 by root, Sat Apr 20 12:35:03 2019 UTC vs.
Revision 1.13 by root, Sat Apr 20 13:46:14 2019 UTC

194 } *celem, default_map[] = { 194 } *celem, default_map[] = {
195 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL }, 195 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },
196 { ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT }, 196 { ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT },
197 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL }, 197 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },
198 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID }, 198 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID },
199 { ASN_UNIVERSAL, ASN_OBJECT_DESCRIPTOR, BER_TYPE_OID },
200 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID }, 199 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
201 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL }, 200 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
201 { ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
202 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 }, 202 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },
203 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 }, 203 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },
204 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 }, 204 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },
205 }; 205 };
206 206
336 // the one-digit case is absolutely predominant, so this pays off (hopefully) 336 // the one-digit case is absolutely predominant, so this pays off (hopefully)
337 if (expect_true (u < 10)) 337 if (expect_true (u < 10))
338 *buf++ = u + '0'; 338 *buf++ = u + '0';
339 else 339 else
340 { 340 {
341 // this *could* be done much faster using branchless fixed-ppint arithmetics
341 char *beg = buf; 342 char *beg = buf;
342 343
343 do 344 do
344 { 345 {
345 *buf++ = u % 10 + '0'; 346 *buf++ = u % 10 + '0';
347 } 348 }
348 while (u); 349 while (u);
349 350
350 // reverse digits 351 // reverse digits
351 char *ptr = buf; 352 char *ptr = buf;
352 while (--ptr != beg) 353 while (--ptr > beg)
353 { 354 {
354 char c = *ptr; 355 char c = *ptr;
355 *ptr = *beg; 356 *ptr = *beg;
356 *beg = c; 357 *beg = c;
357 ++beg; 358 ++beg;
373 } 374 }
374 375
375 U8 *end = cur + len; 376 U8 *end = cur + len;
376 U32 w = get_w (); 377 U32 w = get_w ();
377 378
378 static char oid[MAX_OID_STRLEN]; // must be static 379 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack
379 char *app = oid; 380 char *app = oid;
380 381
381 if (relative) 382 if (relative)
382 app = write_uv (app, w); 383 app = write_uv (app, w);
383 else 384 else
385 app = write_uv (app, (U8)w / 40); 386 app = write_uv (app, (U8)w / 40);
386 *app++ = '.'; 387 *app++ = '.';
387 app = write_uv (app, (U8)w % 40); 388 app = write_uv (app, (U8)w % 40);
388 } 389 }
389 390
391 while (cur < end)
392 {
390 // we assume an oid component is never > 64 bytes 393 // we assume an oid component is never > 64 digits
391 while (cur < end && oid + sizeof (oid) - app > 64) 394 if (oid + sizeof (oid) - app < 64)
392 { 395 croak ("BER_TYPE_OID to long to decode");
396
393 w = get_w (); 397 w = get_w ();
394 *app++ = '.'; 398 *app++ = '.';
395 app = write_uv (app, w); 399 app = write_uv (app, w);
396 } 400 }
397 401
467 } 471 }
468 else 472 else
469 switch (profile_lookup (cur_profile, klass, tag)) 473 switch (profile_lookup (cur_profile, klass, tag))
470 { 474 {
471 case BER_TYPE_NULL: 475 case BER_TYPE_NULL:
476 {
477 U32 len = get_length ();
478
479 if (len)
480 croak ("BER_TYPE_NULL value with non-zero length %d encountered", len);
481
472 res = &PL_sv_undef; 482 res = &PL_sv_undef;
483 }
473 break; 484 break;
474 485
475 case BER_TYPE_BOOL: 486 case BER_TYPE_BOOL:
476 { 487 {
477 U32 len = get_length (); 488 U32 len = get_length ();
478 489
479 if (len != 1) 490 if (len != 1)
480 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len); 491 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len);
481 492
482 res = newSVcacheint (get_u8 () ? 0 : 1); 493 res = newSVcacheint (!!get_u8 ());
483 } 494 }
484 break; 495 break;
485 496
486 case BER_TYPE_OID: 497 case BER_TYPE_OID:
487 res = decode_oid (0); 498 res = decode_oid (0);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines