[ViewVC] Diff of: cvs/Convert-BER-XS/XS.xs

Comparing Convert-BER-XS/XS.xs (file contents):
Revision 1.12 by root, Sat Apr 20 12:35:03 2019 UTC vs.
Revision 1.32 by root, Tue Apr 23 21:20:25 2019 UTC

…		…
8	// sscanf format modifiers and more.	8	// sscanf format modifiers and more.
9		9
10	enum {	10	enum {
11	// ASN_TAG	11	// ASN_TAG
12	ASN_BOOLEAN = 0x01,	12	ASN_BOOLEAN = 0x01,
13	ASN_INTEGER32 = 0x02,	13	ASN_INTEGER = 0x02,
14	ASN_BIT_STRING = 0x03,	14	ASN_BIT_STRING = 0x03,
15	ASN_OCTET_STRING = 0x04,	15	ASN_OCTET_STRING = 0x04,
16	ASN_NULL = 0x05,	16	ASN_NULL = 0x05,
17	ASN_OBJECT_IDENTIFIER = 0x06,	17	ASN_OBJECT_IDENTIFIER = 0x06,
18	ASN_OID = 0x06,	18	ASN_OID = 0x06,
…		…
58	ASN_CLASS_SHIFT = 6,	58	ASN_CLASS_SHIFT = 6,
59		59
60	// ASN_APPLICATION SNMP	60	// ASN_APPLICATION SNMP
61	SNMP_IPADDRESS = 0x00,	61	SNMP_IPADDRESS = 0x00,
62	SNMP_COUNTER32 = 0x01,	62	SNMP_COUNTER32 = 0x01,
		63	SNMP_GAUGE32 = 0x02,
63	SNMP_UNSIGNED32 = 0x02,	64	SNMP_UNSIGNED32 = 0x02,
64	SNMP_TIMETICKS = 0x03,	65	SNMP_TIMETICKS = 0x03,
65	SNMP_OPAQUE = 0x04,	66	SNMP_OPAQUE = 0x04,
66	SNMP_COUNTER64 = 0x06,	67	SNMP_COUNTER64 = 0x06,
67	};	68	};
68		69
		70	// tlow-level types this module can ecode the above (and more) into
69	enum {	71	enum {
70	BER_TYPE_BYTES,	72	BER_TYPE_BYTES,
71	BER_TYPE_UTF8,	73	BER_TYPE_UTF8,
72	BER_TYPE_UCS2,	74	BER_TYPE_UCS2,
73	BER_TYPE_UCS4,	75	BER_TYPE_UCS4,
…		…
79	BER_TYPE_REAL,	81	BER_TYPE_REAL,
80	BER_TYPE_IPADDRESS,	82	BER_TYPE_IPADDRESS,
81	BER_TYPE_CROAK,	83	BER_TYPE_CROAK,
82	};	84	};
83		85
		86	// tuple array indices
84	enum {	87	enum {
85	BER_CLASS = 0,	88	BER_CLASS = 0,
86	BER_TAG = 1,	89	BER_TAG = 1,
87	BER_CONSTRUCTED = 2,	90	BER_FLAGS = 2,
88	BER_DATA = 3,	91	BER_DATA = 3,
89	BER_ARRAYSIZE	92	BER_ARRAYSIZE
90	};	93	};
91		94
92	#define MAX_OID_STRLEN 4096	95	#define MAX_OID_STRLEN 4096
93		96
…		…
140	{	143	{
141	if (!SvOK (profile))	144	if (!SvOK (profile))
142	return default_profile;	145	return default_profile;
143		146
144	if (!SvROK (profile))	147	if (!SvROK (profile))
145	croak ("invalid profile");	148	croak ("Convert::BER::XS::Profile expected");
146		149
147	profile = SvRV (profile);	150	profile = SvRV (profile);
148		151
149	if (SvSTASH (profile) != profile_stash)	152	if (SvSTASH (profile) != profile_stash)
150	croak ("invalid profile object");	153	croak ("Convert::BER::XS::Profile expected");
151		154
152	return (void *)profile;	155	return (void *)profile;
153	}	156	}
154		157
155	static int	158	static int
…		…
181		184
182	SvPVX (sv)[idx] = type;	185	SvPVX (sv)[idx] = type;
183	}	186	}
184		187
185	static SV *	188	static SV *
186	profile_new ()	189	profile_new (void)
187	{	190	{
188	SV *sv = newSVpvn ("", 0);	191	SV *sv = newSVpvn ("", 0);
189		192
190	static const struct {	193	static const struct {
191	int klass;	194	int klass;
192	int tag;	195	int tag;
193	int type;	196	int type;
194	} *celem, default_map[] = {	197	} *celem, default_map[] = {
195	{ ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },	198	{ ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },
196	{ ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT },	199	{ ASN_UNIVERSAL, ASN_INTEGER , BER_TYPE_INT },
197	{ ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },	200	{ ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },
198	{ ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID },	201	{ 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 },	202	{ ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
201	{ ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },	203	{ ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
		204	{ ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
202	{ ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },	205	{ ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },
203	{ ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },	206	{ ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },
204	{ ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },	207	{ ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },
205	};	208	};
206		209
…		…
227	}	230	}
228		231
229	// get_* functions fetch something from the buffer	232	// get_* functions fetch something from the buffer
230	// decode_* functions use get_* fun ctions to decode ber values	233	// decode_* functions use get_* fun ctions to decode ber values
231		234
		235	// get single octet
		236	static U8
		237	get_u8 (void)
		238	{
		239	if (cur == end)
		240	error ("unexpected end of message buffer");
		241
		242	return *cur++;
		243	}
		244
232	// get n octets	245	// get n octets
233	static U8 *	246	static U8 *
234	get_n (UV count)	247	get_n (UV count)
235	{	248	{
236	want (count);	249	want (count);
237	U8 *res = cur;	250	U8 *res = cur;
238	cur += count;	251	cur += count;
239	return res;	252	return res;
240	}	253	}
241		254
242	// get single octet
243	static U8
244	get_u8 (void)
245	{
246	if (cur == end)
247	error ("unexpected end of message buffer");
248
249	return *cur++;
250	}
251
252	// get ber-encoded integer (i.e. pack "w")	255	// get ber-encoded integer (i.e. pack "w")
253	static U32	256	static UV
254	get_w (void)	257	get_w (void)
255	{	258	{
256	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)");
257		264
258	for (;;)	265	for (;;)
259	{	266	{
260	U8 c = get_u8 ();	267	if (expect_false (res >> UVSIZE * 8 - 7))
		268	error ("BER variable length integer overflow");
		269
261	res = (res << 7) \| (c & 0x7f);	270	res = (res << 7) \| (c & 0x7f);
262		271
263	if (!(c & 0x80))	272	if (expect_true (!(c & 0x80)))
264	return res;	273	return res;
265	}
266	}
267		274
		275	c = get_u8 ();
		276	}
		277	}
		278
268	static U32	279	static UV
269	get_length (void)	280	get_length (void)
270	{	281	{
271	U32 res = get_u8 ();	282	UV res = get_u8 ();
272		283
273	if (res & 0x80)	284	if (expect_false (res & 0x80))
274	{	285	{
275	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
276	res = 0;	300	res = 0;
277		301	do
278	switch (cnt)	302	res = (res << 8) \| *cur++;
279	{	303	while (--cnt);
280	case 0:
281	error ("indefinite ASN.1 lengths not supported");
282	return 0;
283
284	default:
285	error ("ASN.1 length too long");
286	return 0;
287
288	case 4: res = (res << 8) \| get_u8 ();
289	case 3: res = (res << 8) \| get_u8 ();
290	case 2: res = (res << 8) \| get_u8 ();
291	case 1: res = (res << 8) \| get_u8 ();
292	}
293	}	304	}
294		305
295	return res;	306	return res;
296	}	307	}
297		308
298	static SV *	309	static SV *
299	decode_int ()	310	decode_int (UV len)
300	{	311	{
301	int len = get_length ();
302
303	if (len <= 0)	312	if (!len)
304	{	313	error ("invalid BER_TYPE_INT length zero (X.690 8.3.1)");
305	error ("integer length equal to zero");
306	return 0;
307	}
308		314
309	U8 *data = get_n (len);	315	U8 *data = get_n (len);
310		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
311	int negative = data [0] & 0x80;	325	int negative = data [0] & 0x80;
312		326
313	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");
314		331
315	do	332	do
316	val = (val << 8) \| *data++;	333	val = (val << 8) \| *data++;
317	while (--len);	334	while (--len);
318		335
…		…
320	// but that's ok, as perl relies on it as well.	337	// but that's ok, as perl relies on it as well.
321	return negative ? newSViv ((IV)val) : newSVuv (val);	338	return negative ? newSViv ((IV)val) : newSVuv (val);
322	}	339	}
323		340
324	static SV *	341	static SV *
325	decode_data (void)	342	decode_data (UV len)
326	{	343	{
327	U32 len = get_length ();
328	U8 *data = get_n (len);
329	return newSVpvn ((char *)data, len);	344	return newSVpvn ((char *)get_n (len), len);
330	}	345	}
331		346
332	// gelper for decode_object_identifier	347	// helper for decode_object_identifier
333	static char *	348	static char *
334	write_uv (char *buf, U32 u)	349	write_uv (char *buf, UV u)
335	{	350	{
336	// 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)
337	if (expect_true (u < 10))	352	if (expect_true (u < 10))
338	*buf++ = u + '0';	353	*buf++ = u + '0';
339	else	354	else
340	{	355	{
		356	// this could be done much faster using branchless fixed-point arithmetics
341	char *beg = buf;	357	char *beg = buf;
342		358
343	do	359	do
344	{	360	{
345	*buf++ = u % 10 + '0';	361	*buf++ = u % 10 + '0';
…		…
347	}	363	}
348	while (u);	364	while (u);
349		365
350	// reverse digits	366	// reverse digits
351	char *ptr = buf;	367	char *ptr = buf;
352	while (--ptr != beg)	368	while (--ptr > beg)
353	{	369	{
354	char c = *ptr;	370	char c = *ptr;
355	ptr = beg;	371	ptr = beg;
356	*beg = c;	372	*beg = c;
357	++beg;	373	++beg;
…		…
360		376
361	return buf;	377	return buf;
362	}	378	}
363		379
364	static SV *	380	static SV *
365	decode_oid (int relative)	381	decode_oid (UV len, int relative)
366	{	382	{
367	U32 len = get_length ();
368
369	if (len <= 0)	383	if (len <= 0)
370	{	384	{
371	error ("OBJECT IDENTIFIER length equal to zero");	385	error ("BER_TYPE_OID length must not be zero");
372	return &PL_sv_undef;	386	return &PL_sv_undef;
373	}	387	}
374		388
375	U8 *end = cur + len;	389	U8 *end = cur + len;
376	U32 w = get_w ();	390	UV w = get_w ();
377		391
378	static char oid[MAX_OID_STRLEN]; // must be static	392	static char oid[MAX_OID_STRLEN]; // static, because too large for stack
379	char *app = oid;	393	char *app = oid;
380		394
381	if (relative)	395	if (relative)
382	app = write_uv (app, w);	396	app = write_uv (app, w);
383	else	397	else
384	{	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
385	app = write_uv (app, (U8)w / 40);	406	app = write_uv (app, w1);
386	*app++ = '.';	407	*app++ = '.';
387	app = write_uv (app, (U8)w % 40);	408	app = write_uv (app, w2);
		409	}
		410
		411	while (cur < end)
388	}	412	{
389
390	// we assume an oid component is never > 64 bytes	413	// we assume an oid component is never > 64 digits
391	while (cur < end && oid + sizeof (oid) - app > 64)	414	if (oid + sizeof (oid) - app < 64)
392	{	415	croak ("BER_TYPE_OID to long to decode");
		416
393	w = get_w ();	417	w = get_w ();
394	*app++ = '.';	418	*app++ = '.';
395	app = write_uv (app, w);	419	app = write_uv (app, w);
396	}	420	}
397		421
398	return newSVpvn (oid, app - oid);	422	return newSVpvn (oid, app - oid);
399	}	423	}
400		424
401	// TODO: this is unacceptably slow	425	// TODO: this is unacceptably slow
402	static SV *	426	static SV *
403	decode_ucs (int chrsize)	427	decode_ucs (UV len, int chrsize)
404	{	428	{
405	SV *res = NEWSV (0, 0);
406
407	U32 len = get_length ();
408
409	if (len & (chrsize - 1))	429	if (len & (chrsize - 1))
410	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);
411		433
412	while (len)	434	while (len)
413	{	435	{
414	U8 b1 = get_u8 ();	436	U8 b1 = get_u8 ();
415	U8 b2 = get_u8 ();	437	U8 b2 = get_u8 ();
…		…
433		455
434	return res;	456	return res;
435	}	457	}
436		458
437	static SV *	459	static SV *
438	decode_ber ()	460	decode_ber (void)
439	{	461	{
440	int identifier = get_u8 ();	462	int identifier = get_u8 ();
441		463
442	SV *res;	464	SV *res;
443		465
…		…
446	int tag = identifier & ASN_TAG_MASK;	468	int tag = identifier & ASN_TAG_MASK;
447		469
448	if (tag == ASN_TAG_BER)	470	if (tag == ASN_TAG_BER)
449	tag = get_w ();	471	tag = get_w ();
450		472
451	if (tag == ASN_TAG_BER)
452	tag = get_w ();
453
454	if (constructed)	473	if (constructed)
455	{	474	{
456	U32 len = get_length ();	475	want (1);
457	U32 seqend = (cur - buf) + len;
458	AV av = (AV )sv_2mortal ((SV *)newAV ());	476	AV av = (AV )sv_2mortal ((SV *)newAV ());
459		477
460	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
461	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;
462		499
463	if (cur > buf + seqend)	500	while (cur < buf + seqend)
		501	av_push (av, decode_ber ());
		502
		503	if (expect_false (cur > buf + seqend))
464	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	}
465		506
466	res = newRV_inc ((SV *)av);	507	res = newRV_inc ((SV *)av);
467	}	508	}
468	else	509	else
		510	{
		511	UV len = get_length ();
		512
469	switch (profile_lookup (cur_profile, klass, tag))	513	switch (profile_lookup (cur_profile, klass, tag))
470	{	514	{
471	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
472	res = &PL_sv_undef;	519	res = &PL_sv_undef;
473	break;	520	break;
474		521
475	case BER_TYPE_BOOL:	522	case BER_TYPE_BOOL:
476	{
477	U32 len = get_length ();
478
479	if (len != 1)	523	if (expect_false (len != 1))
480	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);
481		525
482	res = newSVcacheint (get_u8 () ? 0 : 1);	526	res = newSVcacheint (!!get_u8 ());
483	}
484	break;	527	break;
485		528
486	case BER_TYPE_OID:	529	case BER_TYPE_OID:
487	res = decode_oid (0);	530	res = decode_oid (len, 0);
488	break;	531	break;
489		532
490	case BER_TYPE_RELOID:	533	case BER_TYPE_RELOID:
491	res = decode_oid (1);	534	res = decode_oid (len, 1);
492	break;	535	break;
493		536
494	case BER_TYPE_INT:	537	case BER_TYPE_INT:
495	res = decode_int ();	538	res = decode_int (len);
496	break;	539	break;
497		540
498	case BER_TYPE_UTF8:	541	case BER_TYPE_UTF8:
499	res = decode_data ();	542	res = decode_data (len);
500	SvUTF8_on (res);	543	SvUTF8_on (res);
501	break;	544	break;
502		545
503	case BER_TYPE_BYTES:	546	case BER_TYPE_BYTES:
504	res = decode_data ();	547	res = decode_data (len);
505	break;	548	break;
506		549
507	case BER_TYPE_IPADDRESS:	550	case BER_TYPE_IPADDRESS:
508	{	551	{
509	U32 len = get_length ();
510
511	if (len != 4)	552	if (len != 4)
512	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);
513		554
514	U8 c1 = get_u8 ();	555	U8 *data = get_n (4);
515	U8 c2 = get_u8 ();	556	res = newSVpvf ("%d.%d.%d.%d", data [0], data [1], data [2], data [3]);
516	U8 c3 = get_u8 ();
517	U8 c4 = get_u8 ();
518
519	res = newSVpvf ("%d.%d.%d.%d", c1, c2, c3, c4);
520	}	557	}
521	break;	558	break;
522		559
523	case BER_TYPE_UCS2:	560	case BER_TYPE_UCS2:
524	res = decode_ucs (2);	561	res = decode_ucs (len, 2);
525	break;	562	break;
526		563
527	case BER_TYPE_UCS4:	564	case BER_TYPE_UCS4:
528	res = decode_ucs (4);	565	res = decode_ucs (len, 4);
529	break;	566	break;
530		567
531	case BER_TYPE_REAL:	568	case BER_TYPE_REAL:
		569	error ("BER_TYPE_REAL not implemented");
		570
532	case BER_TYPE_CROAK:	571	case BER_TYPE_CROAK:
		572	croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
		573
533	default:	574	default:
534	croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);	575	croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
535	}	576	}
		577	}
536		578
537	AV *av = newAV ();	579	AV *av = newAV ();
538	av_fill (av, BER_ARRAYSIZE - 1);	580	av_fill (av, BER_ARRAYSIZE - 1);
539	AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass);	581	AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
540	AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);	582	AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
541	AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0);	583	AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
542	AvARRAY (av)[BER_DATA ] = res;	584	AvARRAY (av)[BER_DATA ] = res;
543		585
544	return newRV_noinc ((SV *)av);	586	return newRV_noinc ((SV *)av);
545	}	587	}
546		588
547	/////////////////////////////////////////////////////////////////////////////	589	/////////////////////////////////////////////////////////////////////////////
…		…
552	strlen_sum (STRLEN l1, STRLEN l2)	594	strlen_sum (STRLEN l1, STRLEN l2)
553	{	595	{
554	size_t sum = l1 + l2;	596	size_t sum = l1 + l2;
555		597
556	if (sum < (size_t)l2 \|\| sum != (size_t)(STRLEN)sum)	598	if (sum < (size_t)l2 \|\| sum != (size_t)(STRLEN)sum)
557	croak ("JSON::XS: string size overflow");	599	croak ("Convert::BER::XS: string size overflow");
558		600
559	return sum;	601	return sum;
560	}	602	}
561		603
562	static void	604	static void
…		…
600	need (1);	642	need (1);
601	*cur++ = val;	643	*cur++ = val;
602	}	644	}
603		645
604	static void	646	static void
605	put_w_nocheck (U32 val)	647	put_w_nocheck (UV val)
606	{	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
607	cur = (val >> 7 4) \| 0x80; cur += val >= (1 << (7 * 4));	656	cur = (val >> 7 4) \| 0x80; cur += val >= ((UV)1 << (7 * 4));
608	cur = (val >> 7 3) \| 0x80; cur += val >= (1 << (7 * 3));	657	cur = (val >> 7 3) \| 0x80; cur += val >= ((UV)1 << (7 * 3));
609	cur = (val >> 7 2) \| 0x80; cur += val >= (1 << (7 * 2));	658	cur = (val >> 7 2) \| 0x80; cur += val >= ((UV)1 << (7 * 2));
610	cur = (val >> 7 1) \| 0x80; cur += val >= (1 << (7 * 1));	659	cur = (val >> 7 1) \| 0x80; cur += val >= ((UV)1 << (7 * 1));
611	*cur = val & 0x7f; cur += 1;	660	*cur = val & 0x7f; cur += 1;
612	}	661	}
613		662
614	static void	663	static void
615	put_w (U32 val)	664	put_w (UV val)
616	{	665	{
617	need (5); // we only handle up to 5 bytes	666	need (5); // we only handle up to 5 bytes
618		667
619	put_w_nocheck (val);	668	put_w_nocheck (val);
620	}	669	}
621		670
622	static U8 *	671	static U8 *
623	put_length_at (U32 val, U8 *cur)	672	put_length_at (UV val, U8 *cur)
624	{	673	{
625	if (val < 0x7fU)	674	if (val <= 0x7fU)
626	*cur++ = val;	675	*cur++ = val;
627	else	676	else
628	{	677	{
629	U8 *lenb = cur++;	678	U8 *lenb = cur++;
630		679
631	cur = val >> 24; cur += cur > 0;	680	#if UVSIZE > 4
632	cur = val >> 16; cur += cur > 0;	681	cur = val >> 56; cur += val >= ((UV)1 << (8 7));
633	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));
634	*cur = val ; cur += 1;	689	*cur = val ; cur += 1;
635		690
636	*lenb = 0x80 + cur - lenb - 1;	691	*lenb = 0x80 + cur - lenb - 1;
637	}	692	}
638		693
639	return cur;	694	return cur;
640	}	695	}
641		696
642	static void	697	static void
643	put_length (U32 val)	698	put_length (UV val)
644	{	699	{
645	need (5 + val);	700	need (9 + val);
646	cur = put_length_at (val, cur);	701	cur = put_length_at (val, cur);
647	}	702	}
648		703
649	// return how many bytes the encoded length requires	704	// return how many bytes the encoded length requires
650	static int length_length (U32 val)	705	static int length_length (UV val)
651	{	706	{
652	return val < 0x7fU	707	// use hashing with a DeBruin sequence, anyone?
		708	return expect_true (val <= 0x7fU)
653	? 1	709	? 1
654	: 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	;
655	}	721	}
656		722
657	static void	723	static void
658	encode_data (const char *ptr, STRLEN len)	724	encode_data (const char *ptr, STRLEN len)
659	{	725	{
…		…
721		787
722	*lenb = cur - lenb - 1;	788	*lenb = cur - lenb - 1;
723	}	789	}
724		790
725	// we don't know the length yet, so we optimistically	791	// we don't know the length yet, so we optimistically
726	// assume the length will need one octet later. if that	792	// assume the length will need one octet later. If that
727	// turns out to be wrong, we memove as needed.	793	// turns out to be wrong, we memmove as needed.
728	// mark the beginning	794	// mark the beginning
729	static STRLEN	795	static STRLEN
730	len_fixup_mark ()	796	len_fixup_mark (void)
731	{	797	{
732	return cur++ - buf;	798	return cur++ - buf;
733	}	799	}
734		800
735	// patch up the length	801	// patch up the length
…		…
844	{	910	{
845	AV *av = ber_tuple (tuple);	911	AV *av = ber_tuple (tuple);
846		912
847	int klass = SvIV (AvARRAY (av)[BER_CLASS]);	913	int klass = SvIV (AvARRAY (av)[BER_CLASS]);
848	int tag = SvIV (AvARRAY (av)[BER_TAG]);	914	int tag = SvIV (AvARRAY (av)[BER_TAG]);
849	int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0;	915	int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
850	SV *data = AvARRAY (av)[BER_DATA];	916	SV *data = AvARRAY (av)[BER_DATA];
851		917
852	int identifier = (klass << ASN_CLASS_SHIFT) \| constructed;	918	int identifier = (klass << ASN_CLASS_SHIFT) \| constructed;
853		919
854	if (expect_false (tag >= ASN_TAG_BER))	920	if (expect_false (tag >= ASN_TAG_BER))
…		…
865	// and adjust later	931	// and adjust later
866	need (1);	932	need (1);
867	STRLEN mark = len_fixup_mark ();	933	STRLEN mark = len_fixup_mark ();
868		934
869	if (expect_false (!SvROK (data) \|\| SvTYPE (SvRV (data)) != SVt_PVAV))	935	if (expect_false (!SvROK (data) \|\| SvTYPE (SvRV (data)) != SVt_PVAV))
870	croak ("BER constructed data must be array-reference");	936	croak ("BER CONSTRUCTED data must be array-reference");
871		937
872	AV av = (AV )SvRV (data);	938	AV av = (AV )SvRV (data);
873	int fill = AvFILL (av);	939	int fill = AvFILL (av);
874		940
875	if (expect_false (SvRMAGICAL (av)))	941	if (expect_false (SvRMAGICAL (av)))
876	croak ("BER constructed data must not be tied");	942	croak ("BER CONSTRUCTED data must not be tied");
877		943
878	int i;	944	int i;
879	for (i = 0; i <= fill; ++i)	945	for (i = 0; i <= fill; ++i)
880	encode_ber (AvARRAY (av)[i]);	946	encode_ber (AvARRAY (av)[i]);
881		947
…		…
888	put_length (0);	954	put_length (0);
889	break;	955	break;
890		956
891	case BER_TYPE_BOOL:	957	case BER_TYPE_BOOL:
892	put_length (1);	958	put_length (1);
893	*cur++ = SvTRUE (data) ? 0xff : 0x00;	959	*cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
894	break;	960	break;
895		961
896	case BER_TYPE_OID:	962	case BER_TYPE_OID:
897	encode_oid (data, 0);	963	encode_oid (data, 0);
898	break;	964	break;
…		…
936	case BER_TYPE_UCS4:	1002	case BER_TYPE_UCS4:
937	encode_ucs (data, 4);	1003	encode_ucs (data, 4);
938	break;	1004	break;
939		1005
940	case BER_TYPE_REAL:	1006	case BER_TYPE_REAL:
		1007	croak ("BER_TYPE_REAL not implemented");
		1008
941	case BER_TYPE_CROAK:	1009	case BER_TYPE_CROAK:
		1010	croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
		1011
942	default:	1012	default:
943	croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);	1013	croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
944	}	1014	}
945		1015
946	}	1016	}
…		…
961	const char *name;	1031	const char *name;
962	IV iv;	1032	IV iv;
963	} *civ, const_iv[] = {	1033	} *civ, const_iv[] = {
964	#define const_iv(name) { # name, name },	1034	#define const_iv(name) { # name, name },
965	const_iv (ASN_BOOLEAN)	1035	const_iv (ASN_BOOLEAN)
966	const_iv (ASN_INTEGER32)	1036	const_iv (ASN_INTEGER)
967	const_iv (ASN_BIT_STRING)	1037	const_iv (ASN_BIT_STRING)
968	const_iv (ASN_OCTET_STRING)	1038	const_iv (ASN_OCTET_STRING)
969	const_iv (ASN_NULL)	1039	const_iv (ASN_NULL)
970	const_iv (ASN_OBJECT_IDENTIFIER)	1040	const_iv (ASN_OBJECT_IDENTIFIER)
971	const_iv (ASN_OBJECT_DESCRIPTOR)	1041	const_iv (ASN_OBJECT_DESCRIPTOR)
…		…
1000	const_iv (ASN_CONTEXT)	1070	const_iv (ASN_CONTEXT)
1001	const_iv (ASN_PRIVATE)	1071	const_iv (ASN_PRIVATE)
1002		1072
1003	const_iv (BER_CLASS)	1073	const_iv (BER_CLASS)
1004	const_iv (BER_TAG)	1074	const_iv (BER_TAG)
1005	const_iv (BER_CONSTRUCTED)	1075	const_iv (BER_FLAGS)
1006	const_iv (BER_DATA)	1076	const_iv (BER_DATA)
1007		1077
1008	const_iv (BER_TYPE_BYTES)	1078	const_iv (BER_TYPE_BYTES)
1009	const_iv (BER_TYPE_UTF8)	1079	const_iv (BER_TYPE_UTF8)
1010	const_iv (BER_TYPE_UCS2)	1080	const_iv (BER_TYPE_UCS2)
…		…
1018	const_iv (BER_TYPE_IPADDRESS)	1088	const_iv (BER_TYPE_IPADDRESS)
1019	const_iv (BER_TYPE_CROAK)	1089	const_iv (BER_TYPE_CROAK)
1020		1090
1021	const_iv (SNMP_IPADDRESS)	1091	const_iv (SNMP_IPADDRESS)
1022	const_iv (SNMP_COUNTER32)	1092	const_iv (SNMP_COUNTER32)
		1093	const_iv (SNMP_GAUGE32)
1023	const_iv (SNMP_UNSIGNED32)	1094	const_iv (SNMP_UNSIGNED32)
1024	const_iv (SNMP_TIMETICKS)	1095	const_iv (SNMP_TIMETICKS)
1025	const_iv (SNMP_OPAQUE)	1096	const_iv (SNMP_OPAQUE)
1026	const_iv (SNMP_COUNTER64)	1097	const_iv (SNMP_COUNTER64)
1027	};	1098	};
1028		1099
1029	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--)
1030	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));	1101	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1031	}	1102	}
1032		1103
1033	SV *	1104	void
1034	ber_decode (SV ber, SV profile = &PL_sv_undef)	1105	ber_decode (SV ber, SV profile = &PL_sv_undef)
		1106	ALIAS:
		1107	ber_decode_prefix = 1
1035	CODE:	1108	PPCODE:
1036	{	1109	{
1037	cur_profile = SvPROFILE (profile);	1110	cur_profile = SvPROFILE (profile);
1038	STRLEN len;	1111	STRLEN len;
1039	buf = (U8 *)SvPVbyte (ber, len);	1112	buf = (U8 *)SvPVbyte (ber, len);
1040	cur = buf;	1113	cur = buf;
1041	end = buf + len;	1114	end = buf + len;
1042		1115
1043	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");
1044	}	1125	}
1045	OUTPUT: RETVAL
1046		1126
1047	void	1127	void
1048	ber_is (SV tuple, SV klass = &PL_sv_undef, SV tag = &PL_sv_undef, SV constructed = &PL_sv_undef, SV *data = &PL_sv_undef)	1128	ber_is (SV tuple, SV klass = &PL_sv_undef, SV tag = &PL_sv_undef, SV flags = &PL_sv_undef, SV *data = &PL_sv_undef)
1049	PPCODE:	1129	PPCODE:
1050	{	1130	{
1051	if (!SvOK (tuple))	1131	if (!SvOK (tuple))
1052	XSRETURN_NO;	1132	XSRETURN_NO;
1053		1133
…		…
1055	croak ("ber_is: tuple must be BER tuple (array-ref)");	1135	croak ("ber_is: tuple must be BER tuple (array-ref)");
1056		1136
1057	AV av = (AV )SvRV (tuple);	1137	AV av = (AV )SvRV (tuple);
1058		1138
1059	XPUSHs (	1139	XPUSHs (
1060	(!SvOK (klass) \|\| SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass))	1140	(!SvOK (klass) \|\| SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1061	&& (!SvOK (tag) \|\| SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))	1141	&& (!SvOK (tag) \|\| SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1062	&& (!SvOK (constructed) \|\| !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed))	1142	&& (!SvOK (flags) \|\| !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1063	&& (!SvOK (data) \|\| sv_eq (AvARRAY (av)[BER_DATA ], data))	1143	&& (!SvOK (data) \|\| sv_eq (AvARRAY (av)[BER_DATA ], data))
1064	? &PL_sv_yes : &PL_sv_undef);	1144	? &PL_sv_yes : &PL_sv_undef);
1065	}	1145	}
1066		1146
1067	void	1147	void
1068	ber_is_seq (SV *tuple)	1148	ber_is_seq (SV *tuple)
…		…
1072	XSRETURN_UNDEF;	1152	XSRETURN_UNDEF;
1073		1153
1074	AV *av = ber_tuple (tuple);	1154	AV *av = ber_tuple (tuple);
1075		1155
1076	XPUSHs (	1156	XPUSHs (
1077	SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL	1157	SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1078	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE	1158	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1079	&& SvIV (AvARRAY (av)[BER_CONSTRUCTED])	1159	&& SvIV (AvARRAY (av)[BER_FLAGS])
1080	? AvARRAY (av)[BER_DATA] : &PL_sv_undef);	1160	? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1081	}	1161	}
1082		1162
1083	void	1163	void
1084	ber_is_i32 (SV tuple, SV value = &PL_sv_undef)	1164	ber_is_int (SV tuple, SV value = &PL_sv_undef)
1085	PPCODE:	1165	PPCODE:
1086	{	1166	{
1087	if (!SvOK (tuple))	1167	if (!SvOK (tuple))
1088	XSRETURN_NO;	1168	XSRETURN_NO;
1089		1169
1090	AV *av = ber_tuple (tuple);	1170	AV *av = ber_tuple (tuple);
1091		1171
1092	IV data = SvIV (AvARRAY (av)[BER_DATA]);	1172	UV data = SvUV (AvARRAY (av)[BER_DATA]);
1093		1173
1094	XPUSHs (	1174	XPUSHs (
1095	SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL	1175	SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1096	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32	1176	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1097	&& !SvIV (AvARRAY (av)[BER_CONSTRUCTED])	1177	&& !SvIV (AvARRAY (av)[BER_FLAGS])
1098	&& (!SvOK (value) \|\| data == SvIV (value))	1178	&& (!SvOK (value) \|\| data == SvUV (value))
1099	? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0))	1179	? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1100	: &PL_sv_undef);	1180	: &PL_sv_undef);
1101	}	1181	}
1102		1182
1103	void	1183	void
1104	ber_is_oid (SV tuple, SV oid = &PL_sv_undef)	1184	ber_is_oid (SV tuple, SV oid = &PL_sv_undef)
…		…
1108	XSRETURN_NO;	1188	XSRETURN_NO;
1109		1189
1110	AV *av = ber_tuple (tuple);	1190	AV *av = ber_tuple (tuple);
1111		1191
1112	XPUSHs (	1192	XPUSHs (
1113	SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL	1193	SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1114	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER	1194	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1115	&& !SvIV (AvARRAY (av)[BER_CONSTRUCTED])	1195	&& !SvIV (AvARRAY (av)[BER_FLAGS])
1116	&& (!SvOK (oid) \|\| sv_eq (AvARRAY (av)[BER_DATA], oid))	1196	&& (!SvOK (oid) \|\| sv_eq (AvARRAY (av)[BER_DATA], oid))
1117	? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);	1197	? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1118	}	1198	}
1119		1199
1120	#############################################################################	1200	#############################################################################
…		…
1133	SvCUR_set (buf_sv, cur - buf);	1213	SvCUR_set (buf_sv, cur - buf);
1134	XPUSHs (buf_sv);	1214	XPUSHs (buf_sv);
1135	}	1215	}
1136		1216
1137	SV *	1217	SV *
1138	ber_i32 (IV iv)	1218	ber_int (SV *sv)
1139	CODE:	1219	CODE:
1140	{	1220	{
1141	AV *av = newAV ();	1221	AV *av = newAV ();
1142	av_fill (av, BER_ARRAYSIZE - 1);	1222	av_fill (av, BER_ARRAYSIZE - 1);
1143	AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL);	1223	AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1144	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32);	1224	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1145	AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0);	1225	AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1146	AvARRAY (av)[BER_DATA ] = newSViv (iv);	1226	AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1147	RETVAL = newRV_noinc ((SV *)av);	1227	RETVAL = newRV_noinc ((SV *)av);
1148	}	1228	}
1149	OUTPUT: RETVAL	1229	OUTPUT: RETVAL
1150		1230
1151	# TODO: not arrayref, but elements?	1231	# TODO: not arrayref, but elements?
…		…
1153	ber_seq (SV *arrayref)	1233	ber_seq (SV *arrayref)
1154	CODE:	1234	CODE:
1155	{	1235	{
1156	AV *av = newAV ();	1236	AV *av = newAV ();
1157	av_fill (av, BER_ARRAYSIZE - 1);	1237	av_fill (av, BER_ARRAYSIZE - 1);
1158	AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL);	1238	AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1159	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);	1239	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1160	AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1);	1240	AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1161	AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);	1241	AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1162	RETVAL = newRV_noinc ((SV *)av);	1242	RETVAL = newRV_noinc ((SV *)av);
1163	}	1243	}
1164	OUTPUT: RETVAL	1244	OUTPUT: RETVAL
1165		1245
1166	MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile	1246	MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

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

Comparing Convert-BER-XS/XS.xs (file contents): Revision 1.12 by root, Sat Apr 20 12:35:03 2019 UTC vs. Revision 1.32 by root, Tue Apr 23 21:20:25 2019 UTC

Diff Legend

Comparing Convert-BER-XS/XS.xs (file contents):
Revision 1.12 by root, Sat Apr 20 12:35:03 2019 UTC vs.
Revision 1.32 by root, Tue Apr 23 21:20:25 2019 UTC