[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.28 by root, Tue Apr 23 17:55:54 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	};
…		…
80	BER_TYPE_IPADDRESS,	81	BER_TYPE_IPADDRESS,
81	BER_TYPE_CROAK,	82	BER_TYPE_CROAK,
82	};	83	};
83		84
84	enum {	85	enum {
85	BER_CLASS = 0,	86	BER_CLASS = 0,
86	BER_TAG = 1,	87	BER_TAG = 1,
87	BER_CONSTRUCTED = 2,	88	BER_FLAGS = 2,
88	BER_DATA = 3,	89	BER_DATA = 3,
89	BER_ARRAYSIZE	90	BER_ARRAYSIZE
90	};	91	};
91		92
92	#define MAX_OID_STRLEN 4096	93	#define MAX_OID_STRLEN 4096
93		94
…		…
140	{	141	{
141	if (!SvOK (profile))	142	if (!SvOK (profile))
142	return default_profile;	143	return default_profile;
143		144
144	if (!SvROK (profile))	145	if (!SvROK (profile))
145	croak ("invalid profile");	146	croak ("Convert::BER::XS::Profile expected");
146		147
147	profile = SvRV (profile);	148	profile = SvRV (profile);
148		149
149	if (SvSTASH (profile) != profile_stash)	150	if (SvSTASH (profile) != profile_stash)
150	croak ("invalid profile object");	151	croak ("Convert::BER::XS::Profile expected");
151		152
152	return (void *)profile;	153	return (void *)profile;
153	}	154	}
154		155
155	static int	156	static int
…		…
181		182
182	SvPVX (sv)[idx] = type;	183	SvPVX (sv)[idx] = type;
183	}	184	}
184		185
185	static SV *	186	static SV *
186	profile_new ()	187	profile_new (void)
187	{	188	{
188	SV *sv = newSVpvn ("", 0);	189	SV *sv = newSVpvn ("", 0);
189		190
190	static const struct {	191	static const struct {
191	int klass;	192	int klass;
192	int tag;	193	int tag;
193	int type;	194	int type;
194	} *celem, default_map[] = {	195	} *celem, default_map[] = {
195	{ ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },	196	{ ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },
196	{ ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT },	197	{ ASN_UNIVERSAL, ASN_INTEGER , BER_TYPE_INT },
197	{ ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },	198	{ ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },
198	{ ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID },	199	{ 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 },	200	{ ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
201	{ ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },	201	{ ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
		202	{ ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
202	{ ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },	203	{ ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },
203	{ ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },	204	{ ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },
204	{ ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },	205	{ ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },
205	};	206	};
206		207
…		…
227	}	228	}
228		229
229	// get_* functions fetch something from the buffer	230	// get_* functions fetch something from the buffer
230	// decode_* functions use get_* fun ctions to decode ber values	231	// decode_* functions use get_* fun ctions to decode ber values
231		232
		233	// get single octet
		234	static U8
		235	get_u8 (void)
		236	{
		237	if (cur == end)
		238	error ("unexpected end of message buffer");
		239
		240	return *cur++;
		241	}
		242
232	// get n octets	243	// get n octets
233	static U8 *	244	static U8 *
234	get_n (UV count)	245	get_n (UV count)
235	{	246	{
236	want (count);	247	want (count);
237	U8 *res = cur;	248	U8 *res = cur;
238	cur += count;	249	cur += count;
239	return res;	250	return res;
240	}	251	}
241		252
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")	253	// get ber-encoded integer (i.e. pack "w")
253	static U32	254	static UV
254	get_w (void)	255	get_w (void)
255	{	256	{
256	U32 res = 0;	257	UV res = 0;
		258	U8 c = get_u8 ();
		259
		260	if (expect_false (c == 0x80))
		261	error ("illegal BER padding (X.690 8.1.2.4.2, 8.19.2)");
257		262
258	for (;;)	263	for (;;)
259	{	264	{
260	U8 c = get_u8 ();	265	if (expect_false (res >> UVSIZE * 8 - 7))
		266	error ("BER variable length integer overflow");
		267
261	res = (res << 7) \| (c & 0x7f);	268	res = (res << 7) \| (c & 0x7f);
262		269
263	if (!(c & 0x80))	270	if (!(c & 0x80))
264	return res;	271	return res;
265	}
266	}
267		272
		273	c = get_u8 ();
		274	}
		275	}
		276
268	static U32	277	static UV
269	get_length (void)	278	get_length (void)
270	{	279	{
271	U32 res = get_u8 ();	280	UV res = get_u8 ();
272		281
273	if (res & 0x80)	282	if (res & 0x80)
274	{	283	{
275	int cnt = res & 0x7f;	284	int cnt = res & 0x7f;
276	res = 0;	285	res = 0;
277		286
278	switch (cnt)	287	switch (cnt)
279	{	288	{
280	case 0:	289	case 0:
281	error ("indefinite ASN.1 lengths not supported");	290	error ("indefinite BER value lengths not supported");
282	return 0;	291
		292	case 0x7f:
		293	error ("BER reserved value in length (X.690 8.1.3.5)");
283		294
284	default:	295	default:
285	error ("ASN.1 length too long");	296	error ("BER value length too long (must fit into UV)");
286	return 0;
287		297
		298	#if UVSIZE > 4
		299	case 8: res = (res << 8) \| get_u8 ();
		300	case 7: res = (res << 8) \| get_u8 ();
		301	case 6: res = (res << 8) \| get_u8 ();
		302	case 5: res = (res << 8) \| get_u8 ();
		303	#endif
288	case 4: res = (res << 8) \| get_u8 ();	304	case 4: res = (res << 8) \| get_u8 ();
289	case 3: res = (res << 8) \| get_u8 ();	305	case 3: res = (res << 8) \| get_u8 ();
290	case 2: res = (res << 8) \| get_u8 ();	306	case 2: res = (res << 8) \| get_u8 ();
291	case 1: res = (res << 8) \| get_u8 ();	307	case 1: res = (res << 8) \| get_u8 ();
292	}	308	}
…		…
294		310
295	return res;	311	return res;
296	}	312	}
297		313
298	static SV *	314	static SV *
299	decode_int ()	315	decode_int (void)
300	{	316	{
301	int len = get_length ();	317	UV len = get_length ();
302		318
303	if (len <= 0)	319	if (!len)
304	{	320	error ("invalid BER_TYPE_INT length zero (X.690 8.3.1)");
305	error ("integer length equal to zero");
306	return 0;
307	}
308		321
309	U8 *data = get_n (len);	322	U8 *data = get_n (len);
310		323
		324	if (expect_false (len > 1))
		325	{
		326	U16 mask = (data [0] << 8) \| data [1] & 0xff80;
		327
		328	if (expect_false (mask == 0xff80 \|\| mask == 0x0000))
		329	error ("illegal padding in BER_TYPE_INT (X.690 8.3.2)");
		330	}
		331
311	int negative = data [0] & 0x80;	332	int negative = data [0] & 0x80;
312		333
313	UV val = negative ? -1 : 0; // copy signbit to all bits	334	UV val = negative ? -1 : 0; // copy signbit to all bits
		335
		336	if (len > UVSIZE + (!negative && !*data))
		337	error ("BER_TYPE_INT overflow");
314		338
315	do	339	do
316	val = (val << 8) \| *data++;	340	val = (val << 8) \| *data++;
317	while (--len);	341	while (--len);
318		342
…		…
322	}	346	}
323		347
324	static SV *	348	static SV *
325	decode_data (void)	349	decode_data (void)
326	{	350	{
327	U32 len = get_length ();	351	UV len = get_length ();
328	U8 *data = get_n (len);
329	return newSVpvn ((char *)data, len);	352	return newSVpvn ((char *)get_n (len), len);
330	}	353	}
331		354
332	// gelper for decode_object_identifier	355	// helper for decode_object_identifier
333	static char *	356	static char *
334	write_uv (char *buf, U32 u)	357	write_uv (char *buf, UV u)
335	{	358	{
336	// the one-digit case is absolutely predominant, so this pays off (hopefully)	359	// the one-digit case is absolutely predominant, so this pays off (hopefully)
337	if (expect_true (u < 10))	360	if (expect_true (u < 10))
338	*buf++ = u + '0';	361	*buf++ = u + '0';
339	else	362	else
340	{	363	{
		364	// this could be done much faster using branchless fixed-point arithmetics
341	char *beg = buf;	365	char *beg = buf;
342		366
343	do	367	do
344	{	368	{
345	*buf++ = u % 10 + '0';	369	*buf++ = u % 10 + '0';
…		…
347	}	371	}
348	while (u);	372	while (u);
349		373
350	// reverse digits	374	// reverse digits
351	char *ptr = buf;	375	char *ptr = buf;
352	while (--ptr != beg)	376	while (--ptr > beg)
353	{	377	{
354	char c = *ptr;	378	char c = *ptr;
355	ptr = beg;	379	ptr = beg;
356	*beg = c;	380	*beg = c;
357	++beg;	381	++beg;
…		…
362	}	386	}
363		387
364	static SV *	388	static SV *
365	decode_oid (int relative)	389	decode_oid (int relative)
366	{	390	{
367	U32 len = get_length ();	391	UV len = get_length ();
368		392
369	if (len <= 0)	393	if (len <= 0)
370	{	394	{
371	error ("OBJECT IDENTIFIER length equal to zero");	395	error ("BER_TYPE_OID length must not be zero");
372	return &PL_sv_undef;	396	return &PL_sv_undef;
373	}	397	}
374		398
375	U8 *end = cur + len;	399	U8 *end = cur + len;
376	U32 w = get_w ();	400	UV w = get_w ();
377		401
378	static char oid[MAX_OID_STRLEN]; // must be static	402	static char oid[MAX_OID_STRLEN]; // static, because too large for stack
379	char *app = oid;	403	char *app = oid;
380		404
381	if (relative)	405	if (relative)
382	app = write_uv (app, w);	406	app = write_uv (app, w);
383	else	407	else
384	{	408	{
		409	UV w1, w2;
		410
		411	if (w < 2 * 40)
		412	(w1 = w / 40), (w2 = w % 40);
		413	else
		414	(w1 = 2), (w2 = w - 2 * 40);
		415
385	app = write_uv (app, (U8)w / 40);	416	app = write_uv (app, w1);
386	*app++ = '.';	417	*app++ = '.';
387	app = write_uv (app, (U8)w % 40);	418	app = write_uv (app, w2);
		419	}
		420
		421	while (cur < end)
388	}	422	{
389
390	// we assume an oid component is never > 64 bytes	423	// we assume an oid component is never > 64 digits
391	while (cur < end && oid + sizeof (oid) - app > 64)	424	if (oid + sizeof (oid) - app < 64)
392	{	425	croak ("BER_TYPE_OID to long to decode");
		426
393	w = get_w ();	427	w = get_w ();
394	*app++ = '.';	428	*app++ = '.';
395	app = write_uv (app, w);	429	app = write_uv (app, w);
396	}	430	}
397		431
…		…
402	static SV *	436	static SV *
403	decode_ucs (int chrsize)	437	decode_ucs (int chrsize)
404	{	438	{
405	SV *res = NEWSV (0, 0);	439	SV *res = NEWSV (0, 0);
406		440
407	U32 len = get_length ();	441	UV len = get_length ();
408		442
409	if (len & (chrsize - 1))	443	if (len & (chrsize - 1))
410	croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);	444	croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
411		445
412	while (len)	446	while (len)
…		…
433		467
434	return res;	468	return res;
435	}	469	}
436		470
437	static SV *	471	static SV *
438	decode_ber ()	472	decode_ber (void)
439	{	473	{
440	int identifier = get_u8 ();	474	int identifier = get_u8 ();
441		475
442	SV *res;	476	SV *res;
443		477
…		…
446	int tag = identifier & ASN_TAG_MASK;	480	int tag = identifier & ASN_TAG_MASK;
447		481
448	if (tag == ASN_TAG_BER)	482	if (tag == ASN_TAG_BER)
449	tag = get_w ();	483	tag = get_w ();
450		484
451	if (tag == ASN_TAG_BER)
452	tag = get_w ();
453
454	if (constructed)	485	if (constructed)
455	{	486	{
456	U32 len = get_length ();	487	UV len = get_length ();
457	U32 seqend = (cur - buf) + len;	488	UV seqend = (cur - buf) + len;
458	AV av = (AV )sv_2mortal ((SV *)newAV ());	489	AV av = (AV )sv_2mortal ((SV *)newAV ());
459		490
460	while (cur < buf + seqend)	491	while (cur < buf + seqend)
461	av_push (av, decode_ber ());	492	av_push (av, decode_ber ());
462		493
463	if (cur > buf + seqend)	494	if (cur > buf + seqend)
464	croak ("constructed type %02x overflow (%x %x)\n", identifier, cur - buf, seqend);	495	croak ("CONSTRUCTED type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
465		496
466	res = newRV_inc ((SV *)av);	497	res = newRV_inc ((SV *)av);
467	}	498	}
468	else	499	else
469	switch (profile_lookup (cur_profile, klass, tag))	500	switch (profile_lookup (cur_profile, klass, tag))
470	{	501	{
471	case BER_TYPE_NULL:	502	case BER_TYPE_NULL:
		503	{
		504	UV len = get_length ();
		505
		506	if (len)
		507	croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
		508
472	res = &PL_sv_undef;	509	res = &PL_sv_undef;
		510	}
473	break;	511	break;
474		512
475	case BER_TYPE_BOOL:	513	case BER_TYPE_BOOL:
476	{	514	{
477	U32 len = get_length ();	515	UV len = get_length ();
478		516
479	if (len != 1)	517	if (len != 1)
480	croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len);	518	croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
481		519
482	res = newSVcacheint (get_u8 () ? 0 : 1);	520	res = newSVcacheint (!!get_u8 ());
483	}	521	}
484	break;	522	break;
485		523
486	case BER_TYPE_OID:	524	case BER_TYPE_OID:
487	res = decode_oid (0);	525	res = decode_oid (0);
…		…
504	res = decode_data ();	542	res = decode_data ();
505	break;	543	break;
506		544
507	case BER_TYPE_IPADDRESS:	545	case BER_TYPE_IPADDRESS:
508	{	546	{
509	U32 len = get_length ();	547	UV len = get_length ();
510		548
511	if (len != 4)	549	if (len != 4)
512	croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len);	550	croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
513		551
514	U8 c1 = get_u8 ();	552	U8 c1 = get_u8 ();
515	U8 c2 = get_u8 ();	553	U8 c2 = get_u8 ();
516	U8 c3 = get_u8 ();	554	U8 c3 = get_u8 ();
517	U8 c4 = get_u8 ();	555	U8 c4 = get_u8 ();
…		…
527	case BER_TYPE_UCS4:	565	case BER_TYPE_UCS4:
528	res = decode_ucs (4);	566	res = decode_ucs (4);
529	break;	567	break;
530		568
531	case BER_TYPE_REAL:	569	case BER_TYPE_REAL:
		570	error ("BER_TYPE_REAL not implemented");
		571
532	case BER_TYPE_CROAK:	572	case BER_TYPE_CROAK:
		573	croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
		574
533	default:	575	default:
534	croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);	576	croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
535	}	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 (5 + 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	return val < 0x7fU
653	? 1	708	? 1
654	: 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU);	709	: 2
		710	+ (val > 0xffU)
		711	+ (val > 0xffffU)
		712	+ (val > 0xffffffU)
		713	#if UVSIZE > 4
		714	+ (val > 0xffffffffU)
		715	+ (val > 0xffffffffffU)
		716	+ (val > 0xffffffffffffU)
		717	+ (val > 0xffffffffffffffU)
		718	#endif
		719	;
655	}	720	}
656		721
657	static void	722	static void
658	encode_data (const char *ptr, STRLEN len)	723	encode_data (const char *ptr, STRLEN len)
659	{	724	{
…		…
721		786
722	*lenb = cur - lenb - 1;	787	*lenb = cur - lenb - 1;
723	}	788	}
724		789
725	// we don't know the length yet, so we optimistically	790	// we don't know the length yet, so we optimistically
726	// assume the length will need one octet later. if that	791	// assume the length will need one octet later. If that
727	// turns out to be wrong, we memove as needed.	792	// turns out to be wrong, we memmove as needed.
728	// mark the beginning	793	// mark the beginning
729	static STRLEN	794	static STRLEN
730	len_fixup_mark ()	795	len_fixup_mark (void)
731	{	796	{
732	return cur++ - buf;	797	return cur++ - buf;
733	}	798	}
734		799
735	// patch up the length	800	// patch up the length
…		…
844	{	909	{
845	AV *av = ber_tuple (tuple);	910	AV *av = ber_tuple (tuple);
846		911
847	int klass = SvIV (AvARRAY (av)[BER_CLASS]);	912	int klass = SvIV (AvARRAY (av)[BER_CLASS]);
848	int tag = SvIV (AvARRAY (av)[BER_TAG]);	913	int tag = SvIV (AvARRAY (av)[BER_TAG]);
849	int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0;	914	int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
850	SV *data = AvARRAY (av)[BER_DATA];	915	SV *data = AvARRAY (av)[BER_DATA];
851		916
852	int identifier = (klass << ASN_CLASS_SHIFT) \| constructed;	917	int identifier = (klass << ASN_CLASS_SHIFT) \| constructed;
853		918
854	if (expect_false (tag >= ASN_TAG_BER))	919	if (expect_false (tag >= ASN_TAG_BER))
…		…
865	// and adjust later	930	// and adjust later
866	need (1);	931	need (1);
867	STRLEN mark = len_fixup_mark ();	932	STRLEN mark = len_fixup_mark ();
868		933
869	if (expect_false (!SvROK (data) \|\| SvTYPE (SvRV (data)) != SVt_PVAV))	934	if (expect_false (!SvROK (data) \|\| SvTYPE (SvRV (data)) != SVt_PVAV))
870	croak ("BER constructed data must be array-reference");	935	croak ("BER CONSTRUCTED data must be array-reference");
871		936
872	AV av = (AV )SvRV (data);	937	AV av = (AV )SvRV (data);
873	int fill = AvFILL (av);	938	int fill = AvFILL (av);
874		939
875	if (expect_false (SvRMAGICAL (av)))	940	if (expect_false (SvRMAGICAL (av)))
876	croak ("BER constructed data must not be tied");	941	croak ("BER CONSTRUCTED data must not be tied");
877		942
878	int i;	943	int i;
879	for (i = 0; i <= fill; ++i)	944	for (i = 0; i <= fill; ++i)
880	encode_ber (AvARRAY (av)[i]);	945	encode_ber (AvARRAY (av)[i]);
881		946
…		…
888	put_length (0);	953	put_length (0);
889	break;	954	break;
890		955
891	case BER_TYPE_BOOL:	956	case BER_TYPE_BOOL:
892	put_length (1);	957	put_length (1);
893	*cur++ = SvTRUE (data) ? 0xff : 0x00;	958	*cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
894	break;	959	break;
895		960
896	case BER_TYPE_OID:	961	case BER_TYPE_OID:
897	encode_oid (data, 0);	962	encode_oid (data, 0);
898	break;	963	break;
…		…
936	case BER_TYPE_UCS4:	1001	case BER_TYPE_UCS4:
937	encode_ucs (data, 4);	1002	encode_ucs (data, 4);
938	break;	1003	break;
939		1004
940	case BER_TYPE_REAL:	1005	case BER_TYPE_REAL:
		1006	croak ("BER_TYPE_REAL not implemented");
		1007
941	case BER_TYPE_CROAK:	1008	case BER_TYPE_CROAK:
		1009	croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
		1010
942	default:	1011	default:
943	croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);	1012	croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
944	}	1013	}
945		1014
946	}	1015	}
…		…
961	const char *name;	1030	const char *name;
962	IV iv;	1031	IV iv;
963	} *civ, const_iv[] = {	1032	} *civ, const_iv[] = {
964	#define const_iv(name) { # name, name },	1033	#define const_iv(name) { # name, name },
965	const_iv (ASN_BOOLEAN)	1034	const_iv (ASN_BOOLEAN)
966	const_iv (ASN_INTEGER32)	1035	const_iv (ASN_INTEGER)
967	const_iv (ASN_BIT_STRING)	1036	const_iv (ASN_BIT_STRING)
968	const_iv (ASN_OCTET_STRING)	1037	const_iv (ASN_OCTET_STRING)
969	const_iv (ASN_NULL)	1038	const_iv (ASN_NULL)
970	const_iv (ASN_OBJECT_IDENTIFIER)	1039	const_iv (ASN_OBJECT_IDENTIFIER)
971	const_iv (ASN_OBJECT_DESCRIPTOR)	1040	const_iv (ASN_OBJECT_DESCRIPTOR)
…		…
1000	const_iv (ASN_CONTEXT)	1069	const_iv (ASN_CONTEXT)
1001	const_iv (ASN_PRIVATE)	1070	const_iv (ASN_PRIVATE)
1002		1071
1003	const_iv (BER_CLASS)	1072	const_iv (BER_CLASS)
1004	const_iv (BER_TAG)	1073	const_iv (BER_TAG)
1005	const_iv (BER_CONSTRUCTED)	1074	const_iv (BER_FLAGS)
1006	const_iv (BER_DATA)	1075	const_iv (BER_DATA)
1007		1076
1008	const_iv (BER_TYPE_BYTES)	1077	const_iv (BER_TYPE_BYTES)
1009	const_iv (BER_TYPE_UTF8)	1078	const_iv (BER_TYPE_UTF8)
1010	const_iv (BER_TYPE_UCS2)	1079	const_iv (BER_TYPE_UCS2)
…		…
1018	const_iv (BER_TYPE_IPADDRESS)	1087	const_iv (BER_TYPE_IPADDRESS)
1019	const_iv (BER_TYPE_CROAK)	1088	const_iv (BER_TYPE_CROAK)
1020		1089
1021	const_iv (SNMP_IPADDRESS)	1090	const_iv (SNMP_IPADDRESS)
1022	const_iv (SNMP_COUNTER32)	1091	const_iv (SNMP_COUNTER32)
		1092	const_iv (SNMP_GAUGE32)
1023	const_iv (SNMP_UNSIGNED32)	1093	const_iv (SNMP_UNSIGNED32)
1024	const_iv (SNMP_TIMETICKS)	1094	const_iv (SNMP_TIMETICKS)
1025	const_iv (SNMP_OPAQUE)	1095	const_iv (SNMP_OPAQUE)
1026	const_iv (SNMP_COUNTER64)	1096	const_iv (SNMP_COUNTER64)
1027	};	1097	};
1028		1098
1029	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)	1099	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));	1100	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1031	}	1101	}
1032		1102
1033	SV *	1103	void
1034	ber_decode (SV ber, SV profile = &PL_sv_undef)	1104	ber_decode (SV ber, SV profile = &PL_sv_undef)
		1105	ALIAS:
		1106	ber_decode_prefix = 1
1035	CODE:	1107	PPCODE:
1036	{	1108	{
1037	cur_profile = SvPROFILE (profile);	1109	cur_profile = SvPROFILE (profile);
1038	STRLEN len;	1110	STRLEN len;
1039	buf = (U8 *)SvPVbyte (ber, len);	1111	buf = (U8 *)SvPVbyte (ber, len);
1040	cur = buf;	1112	cur = buf;
1041	end = buf + len;	1113	end = buf + len;
1042		1114
1043	RETVAL = decode_ber ();	1115	SV *tuple = decode_ber ();
		1116
		1117	EXTEND (SP, 2);
		1118	PUSHs (sv_2mortal (tuple));
		1119
		1120	if (ix)
		1121	PUSHs (sv_2mortal (newSViv (cur - buf)));
		1122	else if (cur != end)
		1123	error ("trailing garbage after BER value");
1044	}	1124	}
1045	OUTPUT: RETVAL
1046		1125
1047	void	1126	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)	1127	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:	1128	PPCODE:
1050	{	1129	{
1051	if (!SvOK (tuple))	1130	if (!SvOK (tuple))
1052	XSRETURN_NO;	1131	XSRETURN_NO;
1053		1132
…		…
1055	croak ("ber_is: tuple must be BER tuple (array-ref)");	1134	croak ("ber_is: tuple must be BER tuple (array-ref)");
1056		1135
1057	AV av = (AV )SvRV (tuple);	1136	AV av = (AV )SvRV (tuple);
1058		1137
1059	XPUSHs (	1138	XPUSHs (
1060	(!SvOK (klass) \|\| SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass))	1139	(!SvOK (klass) \|\| SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1061	&& (!SvOK (tag) \|\| SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))	1140	&& (!SvOK (tag) \|\| SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1062	&& (!SvOK (constructed) \|\| !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed))	1141	&& (!SvOK (flags) \|\| !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1063	&& (!SvOK (data) \|\| sv_eq (AvARRAY (av)[BER_DATA ], data))	1142	&& (!SvOK (data) \|\| sv_eq (AvARRAY (av)[BER_DATA ], data))
1064	? &PL_sv_yes : &PL_sv_undef);	1143	? &PL_sv_yes : &PL_sv_undef);
1065	}	1144	}
1066		1145
1067	void	1146	void
1068	ber_is_seq (SV *tuple)	1147	ber_is_seq (SV *tuple)
…		…
1072	XSRETURN_UNDEF;	1151	XSRETURN_UNDEF;
1073		1152
1074	AV *av = ber_tuple (tuple);	1153	AV *av = ber_tuple (tuple);
1075		1154
1076	XPUSHs (	1155	XPUSHs (
1077	SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL	1156	SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1078	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE	1157	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1079	&& SvIV (AvARRAY (av)[BER_CONSTRUCTED])	1158	&& SvIV (AvARRAY (av)[BER_FLAGS])
1080	? AvARRAY (av)[BER_DATA] : &PL_sv_undef);	1159	? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1081	}	1160	}
1082		1161
1083	void	1162	void
1084	ber_is_i32 (SV tuple, SV value = &PL_sv_undef)	1163	ber_is_int (SV tuple, SV value = &PL_sv_undef)
1085	PPCODE:	1164	PPCODE:
1086	{	1165	{
1087	if (!SvOK (tuple))	1166	if (!SvOK (tuple))
1088	XSRETURN_NO;	1167	XSRETURN_NO;
1089		1168
1090	AV *av = ber_tuple (tuple);	1169	AV *av = ber_tuple (tuple);
1091		1170
1092	IV data = SvIV (AvARRAY (av)[BER_DATA]);	1171	UV data = SvUV (AvARRAY (av)[BER_DATA]);
1093		1172
1094	XPUSHs (	1173	XPUSHs (
1095	SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL	1174	SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1096	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32	1175	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1097	&& !SvIV (AvARRAY (av)[BER_CONSTRUCTED])	1176	&& !SvIV (AvARRAY (av)[BER_FLAGS])
1098	&& (!SvOK (value) \|\| data == SvIV (value))	1177	&& (!SvOK (value) \|\| data == SvUV (value))
1099	? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0))	1178	? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1100	: &PL_sv_undef);	1179	: &PL_sv_undef);
1101	}	1180	}
1102		1181
1103	void	1182	void
1104	ber_is_oid (SV tuple, SV oid = &PL_sv_undef)	1183	ber_is_oid (SV tuple, SV oid = &PL_sv_undef)
…		…
1108	XSRETURN_NO;	1187	XSRETURN_NO;
1109		1188
1110	AV *av = ber_tuple (tuple);	1189	AV *av = ber_tuple (tuple);
1111		1190
1112	XPUSHs (	1191	XPUSHs (
1113	SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL	1192	SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1114	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER	1193	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1115	&& !SvIV (AvARRAY (av)[BER_CONSTRUCTED])	1194	&& !SvIV (AvARRAY (av)[BER_FLAGS])
1116	&& (!SvOK (oid) \|\| sv_eq (AvARRAY (av)[BER_DATA], oid))	1195	&& (!SvOK (oid) \|\| sv_eq (AvARRAY (av)[BER_DATA], oid))
1117	? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);	1196	? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1118	}	1197	}
1119		1198
1120	#############################################################################	1199	#############################################################################
…		…
1133	SvCUR_set (buf_sv, cur - buf);	1212	SvCUR_set (buf_sv, cur - buf);
1134	XPUSHs (buf_sv);	1213	XPUSHs (buf_sv);
1135	}	1214	}
1136		1215
1137	SV *	1216	SV *
1138	ber_i32 (IV iv)	1217	ber_int (SV *sv)
1139	CODE:	1218	CODE:
1140	{	1219	{
1141	AV *av = newAV ();	1220	AV *av = newAV ();
1142	av_fill (av, BER_ARRAYSIZE - 1);	1221	av_fill (av, BER_ARRAYSIZE - 1);
1143	AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL);	1222	AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1144	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32);	1223	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1145	AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0);	1224	AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1146	AvARRAY (av)[BER_DATA ] = newSViv (iv);	1225	AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1147	RETVAL = newRV_noinc ((SV *)av);	1226	RETVAL = newRV_noinc ((SV *)av);
1148	}	1227	}
1149	OUTPUT: RETVAL	1228	OUTPUT: RETVAL
1150		1229
1151	# TODO: not arrayref, but elements?	1230	# TODO: not arrayref, but elements?
…		…
1153	ber_seq (SV *arrayref)	1232	ber_seq (SV *arrayref)
1154	CODE:	1233	CODE:
1155	{	1234	{
1156	AV *av = newAV ();	1235	AV *av = newAV ();
1157	av_fill (av, BER_ARRAYSIZE - 1);	1236	av_fill (av, BER_ARRAYSIZE - 1);
1158	AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL);	1237	AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1159	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);	1238	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1160	AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1);	1239	AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1161	AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);	1240	AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1162	RETVAL = newRV_noinc ((SV *)av);	1241	RETVAL = newRV_noinc ((SV *)av);
1163	}	1242	}
1164	OUTPUT: RETVAL	1243	OUTPUT: RETVAL
1165		1244
1166	MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile	1245	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.28 by root, Tue Apr 23 17:55:54 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.28 by root, Tue Apr 23 17:55:54 2019 UTC