[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Libtasn1-commit] [SCM] GNU libtasn1 branch, master, updated. libtasn1_2
|
From: |
Simon Josefsson |
|
Subject: |
[Libtasn1-commit] [SCM] GNU libtasn1 branch, master, updated. libtasn1_2_4-8-g630956b |
|
Date: |
Wed, 17 Feb 2010 12:33:19 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libtasn1".
http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=630956b3e379d8527604e3d5d4f8c5d8beed6c46
The branch, master has been updated
via 630956b3e379d8527604e3d5d4f8c5d8beed6c46 (commit)
via 10bf3388818273f405d1e6797c48cbeb2db8298f (commit)
via 77597f0257d985553d9342ea48bb75f1cef3f92b (commit)
via e257d63b41679ec3bf7938f6952b65605aaa2888 (commit)
via 6de4d57f97dca0114ff0b57df031a7fa4ccb2842 (commit)
from f3e00e801f8066d61a42b6d9d5c981e8ec4bfd9e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 630956b3e379d8527604e3d5d4f8c5d8beed6c46
Author: Simon Josefsson <address@hidden>
Date: Wed Feb 17 13:18:58 2010 +0100
Generated.
commit 10bf3388818273f405d1e6797c48cbeb2db8298f
Author: Simon Josefsson <address@hidden>
Date: Wed Feb 17 13:02:12 2010 +0100
Fix.
commit 77597f0257d985553d9342ea48bb75f1cef3f92b
Author: Simon Josefsson <address@hidden>
Date: Wed Feb 17 13:01:24 2010 +0100
More GTK-DOC comment fixes.
commit e257d63b41679ec3bf7938f6952b65605aaa2888
Author: Simon Josefsson <address@hidden>
Date: Wed Feb 17 12:57:49 2010 +0100
More GTK-DOC comment fixes.
commit 6de4d57f97dca0114ff0b57df031a7fa4ccb2842
Author: Simon Josefsson <address@hidden>
Date: Wed Feb 17 12:55:57 2010 +0100
Improve GTK-DOC comments.
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 14 ++-
NEWS | 3 +-
lib/ASN1.c | 344 ++++++++++++++++++++++++-------------------------
lib/ASN1.y | 122 +++++++++---------
lib/coding.c | 51 ++++----
lib/decoding.c | 245 +++++++++++++++++------------------
lib/element.c | 383 +++++++++++++++++++++++++++---------------------------
lib/errors.c | 28 +++--
lib/parser_aux.c | 2 +-
lib/structure.c | 205 ++++++++++++++---------------
10 files changed, 693 insertions(+), 704 deletions(-)
diff --git a/.gitignore b/.gitignore
index 1c6e0a6..854731a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,6 +83,7 @@ gl/.deps/
gl/.libs/
gl/Makefile
gl/Makefile.in
+gl/arg-nonnull.h
gl/libgnu.la
gl/progname.lo
gl/progname.o
@@ -94,10 +95,13 @@ gl/version-etc-fsf.lo
gl/version-etc-fsf.o
gl/version-etc.lo
gl/version-etc.o
+gl/warn-on-use.h
+gl/wchar.h
lib/.deps/
lib/.libs/
lib/ASN1.lo
lib/ASN1.o
+lib/ASN1.tab.c
lib/Makefile
lib/Makefile.in
lib/coding.lo
@@ -108,10 +112,16 @@ lib/element.lo
lib/element.o
lib/errors.lo
lib/errors.o
+lib/gllib/.deps/
lib/gllib/.libs/
lib/gllib/Makefile
lib/gllib/Makefile.in
+lib/gllib/arg-nonnull.h
+lib/gllib/dummy.lo
+lib/gllib/dummy.o
lib/gllib/libgnu.la
+lib/gllib/warn-on-use.h
+lib/gllib/wchar.h
lib/gstr.lo
lib/gstr.o
lib/libtasn1.la
@@ -151,7 +161,3 @@ tests/Test_parser.o
tests/Test_parser_ERROR.asn
tests/Test_tree
tests/Test_tree.o
-lib/ASN1.tab.c
-lib/gllib/.deps/
-lib/gllib/dummy.lo
-lib/gllib/dummy.o
diff --git a/NEWS b/NEWS
index 8bae746..288197e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,8 @@
GNU Libtasn1 NEWS -*- outline -*-
* Noteworthy changes in release 2.5 (????-??-??) [?]
-- Updated gnulib files.
+- doc: Improve GTK-DOC comments.
+- misc: Updated gnulib files.
* Noteworthy changes in release 2.4 (2010-01-18) [stable]
- Doc fixes.
diff --git a/lib/ASN1.c b/lib/ASN1.c
index 463f5a1..7fdd244 100644
--- a/lib/ASN1.c
+++ b/lib/ASN1.c
@@ -100,7 +100,6 @@
* 02110-1301, USA
*/
-
/*****************************************************/
/* File: x509_ASN.y */
/* Description: input file for 'bison' program. */
@@ -133,7 +132,7 @@ static int _asn1_yylex(void);
/* Line 189 of yacc.c */
-#line 137 "ASN1.c"
+#line 136 "ASN1.c"
/* Enabling traces. */
#ifndef YYDEBUG
@@ -248,7 +247,7 @@ typedef union YYSTYPE
{
/* Line 214 of yacc.c */
-#line 59 "ASN1.y"
+#line 58 "ASN1.y"
unsigned int constant;
char str[ASN1_MAX_NAME_SIZE+1];
@@ -257,7 +256,7 @@ typedef union YYSTYPE
/* Line 214 of yacc.c */
-#line 261 "ASN1.c"
+#line 260 "ASN1.c"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -269,7 +268,7 @@ typedef union YYSTYPE
/* Line 264 of yacc.c */
-#line 273 "ASN1.c"
+#line 272 "ASN1.c"
#ifdef short
# undef short
@@ -595,16 +594,16 @@ static const yytype_int8 yyrhs[] =
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 120, 120, 133, 134, 137, 141, 142, 145, 146,
- 149, 150, 153, 155, 160, 161, 165, 167, 172, 173,
- 177, 178, 179, 182, 184, 188, 189, 190, 193, 195,
- 196, 200, 201, 205, 206, 208, 209, 216, 219, 220,
- 223, 225, 231, 232, 235, 236, 240, 241, 245, 250,
- 251, 255, 256, 257, 262, 268, 271, 273, 276, 277,
- 278, 279, 280, 281, 282, 283, 284, 285, 286, 287,
- 288, 291, 292, 297, 298, 301, 304, 307, 308, 312,
- 314, 316, 321, 323, 325, 330, 334, 335, 340, 343,
- 347, 352, 358, 359, 362, 363, 367, 370, 394, 395
+ 0, 119, 119, 132, 133, 136, 140, 141, 144, 145,
+ 148, 149, 152, 154, 159, 160, 164, 166, 171, 172,
+ 176, 177, 178, 181, 183, 187, 188, 189, 192, 194,
+ 195, 199, 200, 204, 205, 207, 208, 215, 218, 219,
+ 222, 224, 230, 231, 234, 235, 239, 240, 244, 249,
+ 250, 254, 255, 256, 261, 267, 270, 272, 275, 276,
+ 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
+ 287, 290, 291, 296, 297, 300, 303, 306, 307, 311,
+ 313, 315, 320, 322, 324, 329, 333, 334, 339, 342,
+ 346, 351, 357, 358, 361, 362, 366, 369, 393, 394
};
#endif
@@ -1640,7 +1639,7 @@ yyreduce:
case 2:
/* Line 1455 of yacc.c */
-#line 123 "ASN1.y"
+#line 122 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_DEFINITIONS|(yyvsp[(3) - (8)].constant));
_asn1_set_name((yyval.node),_asn1_get_name((yyvsp[(1) -
(8)].node)));
_asn1_set_name((yyvsp[(1) - (8)].node),"");
@@ -1654,21 +1653,21 @@ yyreduce:
case 3:
/* Line 1455 of yacc.c */
-#line 133 "ASN1.y"
+#line 132 "ASN1.y"
{strcpy((yyval.str),(yyvsp[(1) - (1)].str));}
break;
case 4:
/* Line 1455 of yacc.c */
-#line 134 "ASN1.y"
+#line 133 "ASN1.y"
{strcpy((yyval.str),(yyvsp[(2) - (2)].str));}
break;
case 5:
/* Line 1455 of yacc.c */
-#line 137 "ASN1.y"
+#line 136 "ASN1.y"
{strcpy((yyval.str),"-");
strcat((yyval.str),(yyvsp[(2) - (2)].str));}
break;
@@ -1676,49 +1675,49 @@ yyreduce:
case 6:
/* Line 1455 of yacc.c */
-#line 141 "ASN1.y"
+#line 140 "ASN1.y"
{strcpy((yyval.str),(yyvsp[(1) - (1)].str));}
break;
case 7:
/* Line 1455 of yacc.c */
-#line 142 "ASN1.y"
+#line 141 "ASN1.y"
{strcpy((yyval.str),(yyvsp[(1) - (1)].str));}
break;
case 8:
/* Line 1455 of yacc.c */
-#line 145 "ASN1.y"
+#line 144 "ASN1.y"
{strcpy((yyval.str),(yyvsp[(1) - (1)].str));}
break;
case 9:
/* Line 1455 of yacc.c */
-#line 146 "ASN1.y"
+#line 145 "ASN1.y"
{strcpy((yyval.str),(yyvsp[(1) - (1)].str));}
break;
case 10:
/* Line 1455 of yacc.c */
-#line 149 "ASN1.y"
+#line 148 "ASN1.y"
{strcpy((yyval.str),(yyvsp[(1) - (1)].str));}
break;
case 11:
/* Line 1455 of yacc.c */
-#line 150 "ASN1.y"
+#line 149 "ASN1.y"
{strcpy((yyval.str),(yyvsp[(1) - (1)].str));}
break;
case 12:
/* Line 1455 of yacc.c */
-#line 153 "ASN1.y"
+#line 152 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_CONSTANT);
_asn1_set_value((yyval.node),(yyvsp[(2)
- (3)].str),strlen((yyvsp[(2) - (3)].str))+1);}
break;
@@ -1726,7 +1725,7 @@ yyreduce:
case 13:
/* Line 1455 of yacc.c */
-#line 155 "ASN1.y"
+#line 154 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_CONSTANT);
_asn1_set_name((yyval.node),(yyvsp[(1) -
(4)].str));
_asn1_set_value((yyval.node),(yyvsp[(3)
- (4)].str),strlen((yyvsp[(3) - (4)].str))+1);}
@@ -1735,14 +1734,14 @@ yyreduce:
case 14:
/* Line 1455 of yacc.c */
-#line 160 "ASN1.y"
+#line 159 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 15:
/* Line 1455 of yacc.c */
-#line 161 "ASN1.y"
+#line 160 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (3)].node);
_asn1_set_right(_asn1_get_last_right((yyvsp[(1) - (3)].node)),(yyvsp[(3) -
(3)].node));}
break;
@@ -1750,7 +1749,7 @@ yyreduce:
case 16:
/* Line 1455 of yacc.c */
-#line 165 "ASN1.y"
+#line 164 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_CONSTANT);
_asn1_set_value((yyval.node),(yyvsp[(1) -
(1)].str),strlen((yyvsp[(1) - (1)].str))+1);}
break;
@@ -1758,7 +1757,7 @@ yyreduce:
case 17:
/* Line 1455 of yacc.c */
-#line 167 "ASN1.y"
+#line 166 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_CONSTANT);
_asn1_set_name((yyval.node),(yyvsp[(1) -
(4)].str));
_asn1_set_value((yyval.node),(yyvsp[(3) -
(4)].str),strlen((yyvsp[(3) - (4)].str))+1);}
@@ -1767,14 +1766,14 @@ yyreduce:
case 18:
/* Line 1455 of yacc.c */
-#line 172 "ASN1.y"
+#line 171 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 19:
/* Line 1455 of yacc.c */
-#line 173 "ASN1.y"
+#line 172 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (2)].node);
_asn1_set_right(_asn1_get_last_right((yyvsp[(1) - (2)].node)),(yyvsp[(2) -
(2)].node));}
break;
@@ -1782,28 +1781,28 @@ yyreduce:
case 20:
/* Line 1455 of yacc.c */
-#line 177 "ASN1.y"
+#line 176 "ASN1.y"
{(yyval.constant)=CONST_UNIVERSAL;}
break;
case 21:
/* Line 1455 of yacc.c */
-#line 178 "ASN1.y"
+#line 177 "ASN1.y"
{(yyval.constant)=CONST_PRIVATE;}
break;
case 22:
/* Line 1455 of yacc.c */
-#line 179 "ASN1.y"
+#line 178 "ASN1.y"
{(yyval.constant)=CONST_APPLICATION;}
break;
case 23:
/* Line 1455 of yacc.c */
-#line 182 "ASN1.y"
+#line 181 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_TAG);
_asn1_set_value((yyval.node),(yyvsp[(2) -
(3)].str),strlen((yyvsp[(2) - (3)].str))+1);}
break;
@@ -1811,7 +1810,7 @@ yyreduce:
case 24:
/* Line 1455 of yacc.c */
-#line 184 "ASN1.y"
+#line 183 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_TAG | (yyvsp[(2) - (4)].constant));
_asn1_set_value((yyval.node),(yyvsp[(3) -
(4)].str),strlen((yyvsp[(3) - (4)].str))+1);}
break;
@@ -1819,28 +1818,28 @@ yyreduce:
case 25:
/* Line 1455 of yacc.c */
-#line 188 "ASN1.y"
+#line 187 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 26:
/* Line 1455 of yacc.c */
-#line 189 "ASN1.y"
+#line 188 "ASN1.y"
{(yyval.node)=_asn1_mod_type((yyvsp[(1) - (2)].node),CONST_EXPLICIT);}
break;
case 27:
/* Line 1455 of yacc.c */
-#line 190 "ASN1.y"
+#line 189 "ASN1.y"
{(yyval.node)=_asn1_mod_type((yyvsp[(1) - (2)].node),CONST_IMPLICIT);}
break;
case 28:
/* Line 1455 of yacc.c */
-#line 193 "ASN1.y"
+#line 192 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_DEFAULT);
_asn1_set_value((yyval.node),(yyvsp[(2)
- (2)].str),strlen((yyvsp[(2) - (2)].str))+1);}
break;
@@ -1848,28 +1847,28 @@ yyreduce:
case 29:
/* Line 1455 of yacc.c */
-#line 195 "ASN1.y"
+#line 194 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_DEFAULT|CONST_TRUE);}
break;
case 30:
/* Line 1455 of yacc.c */
-#line 196 "ASN1.y"
+#line 195 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_DEFAULT|CONST_FALSE);}
break;
case 33:
/* Line 1455 of yacc.c */
-#line 205 "ASN1.y"
+#line 204 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_INTEGER);}
break;
case 34:
/* Line 1455 of yacc.c */
-#line 206 "ASN1.y"
+#line 205 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_INTEGER|CONST_LIST);
_asn1_set_down((yyval.node),(yyvsp[(3)
- (4)].node));}
break;
@@ -1877,14 +1876,14 @@ yyreduce:
case 35:
/* Line 1455 of yacc.c */
-#line 208 "ASN1.y"
+#line 207 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_INTEGER);}
break;
case 36:
/* Line 1455 of yacc.c */
-#line 210 "ASN1.y"
+#line 209 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_INTEGER|CONST_MIN_MAX);
_asn1_set_down((yyval.node),_asn1_add_node(TYPE_SIZE));
_asn1_set_value(_asn1_get_down((yyval.node)),(yyvsp[(6) -
(7)].str),strlen((yyvsp[(6) - (7)].str))+1);
@@ -1894,28 +1893,28 @@ yyreduce:
case 37:
/* Line 1455 of yacc.c */
-#line 216 "ASN1.y"
+#line 215 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_BOOLEAN);}
break;
case 38:
/* Line 1455 of yacc.c */
-#line 219 "ASN1.y"
+#line 218 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_TIME|CONST_UTC);}
break;
case 39:
/* Line 1455 of yacc.c */
-#line 220 "ASN1.y"
+#line 219 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_TIME|CONST_GENERALIZED);}
break;
case 40:
/* Line 1455 of yacc.c */
-#line 223 "ASN1.y"
+#line 222 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_SIZE|CONST_1_PARAM);
_asn1_set_value((yyval.node),(yyvsp[(3) -
(4)].str),strlen((yyvsp[(3) - (4)].str))+1);}
break;
@@ -1923,7 +1922,7 @@ yyreduce:
case 41:
/* Line 1455 of yacc.c */
-#line 226 "ASN1.y"
+#line 225 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_SIZE|CONST_MIN_MAX);
_asn1_set_value((yyval.node),(yyvsp[(3) -
(7)].str),strlen((yyvsp[(3) - (7)].str))+1);
_asn1_set_name((yyval.node),(yyvsp[(6) -
(7)].str));}
@@ -1932,28 +1931,28 @@ yyreduce:
case 42:
/* Line 1455 of yacc.c */
-#line 231 "ASN1.y"
+#line 230 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 43:
/* Line 1455 of yacc.c */
-#line 232 "ASN1.y"
+#line 231 "ASN1.y"
{(yyval.node)=(yyvsp[(2) - (3)].node);}
break;
case 44:
/* Line 1455 of yacc.c */
-#line 235 "ASN1.y"
+#line 234 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_GENERALSTRING);}
break;
case 45:
/* Line 1455 of yacc.c */
-#line 236 "ASN1.y"
+#line 235 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_GENERALSTRING|CONST_SIZE);
_asn1_set_down((yyval.node),(yyvsp[(2) - (2)].node));}
break;
@@ -1961,14 +1960,14 @@ yyreduce:
case 46:
/* Line 1455 of yacc.c */
-#line 240 "ASN1.y"
+#line 239 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_OCTET_STRING);}
break;
case 47:
/* Line 1455 of yacc.c */
-#line 241 "ASN1.y"
+#line 240 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_OCTET_STRING|CONST_SIZE);
_asn1_set_down((yyval.node),(yyvsp[(3) - (3)].node));}
break;
@@ -1976,7 +1975,7 @@ yyreduce:
case 48:
/* Line 1455 of yacc.c */
-#line 245 "ASN1.y"
+#line 244 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_CONSTANT);
_asn1_set_name((yyval.node),(yyvsp[(1) -
(4)].str));
_asn1_set_value((yyval.node),(yyvsp[(3) -
(4)].str),strlen((yyvsp[(3) - (4)].str))+1);}
@@ -1985,14 +1984,14 @@ yyreduce:
case 49:
/* Line 1455 of yacc.c */
-#line 250 "ASN1.y"
+#line 249 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 50:
/* Line 1455 of yacc.c */
-#line 251 "ASN1.y"
+#line 250 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (3)].node);
_asn1_set_right(_asn1_get_last_right((yyvsp[(1) - (3)].node)),(yyvsp[(3) -
(3)].node));}
break;
@@ -2000,21 +1999,21 @@ yyreduce:
case 51:
/* Line 1455 of yacc.c */
-#line 255 "ASN1.y"
+#line 254 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_BIT_STRING);}
break;
case 52:
/* Line 1455 of yacc.c */
-#line 256 "ASN1.y"
+#line 255 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_BIT_STRING|CONST_SIZE);}
break;
case 53:
/* Line 1455 of yacc.c */
-#line 258 "ASN1.y"
+#line 257 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_BIT_STRING|CONST_LIST);
_asn1_set_down((yyval.node),(yyvsp[(4) -
(5)].node));}
break;
@@ -2022,7 +2021,7 @@ yyreduce:
case 54:
/* Line 1455 of yacc.c */
-#line 263 "ASN1.y"
+#line 262 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_ENUMERATED|CONST_LIST);
_asn1_set_down((yyval.node),(yyvsp[(3) -
(4)].node));}
break;
@@ -2030,14 +2029,14 @@ yyreduce:
case 55:
/* Line 1455 of yacc.c */
-#line 268 "ASN1.y"
+#line 267 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_OBJECT_ID);}
break;
case 56:
/* Line 1455 of yacc.c */
-#line 271 "ASN1.y"
+#line 270 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_IDENTIFIER);
_asn1_set_value((yyval.node),(yyvsp[(1)
- (1)].str),strlen((yyvsp[(1) - (1)].str))+1);}
break;
@@ -2045,7 +2044,7 @@ yyreduce:
case 57:
/* Line 1455 of yacc.c */
-#line 273 "ASN1.y"
+#line 272 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_IDENTIFIER|CONST_SIZE);
_asn1_set_value((yyval.node),(yyvsp[(1)
- (2)].str),strlen((yyvsp[(1) - (2)].str))+1);
_asn1_set_down((yyval.node),(yyvsp[(2)
- (2)].node));}
@@ -2054,98 +2053,98 @@ yyreduce:
case 58:
/* Line 1455 of yacc.c */
-#line 276 "ASN1.y"
+#line 275 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 59:
/* Line 1455 of yacc.c */
-#line 277 "ASN1.y"
+#line 276 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 60:
/* Line 1455 of yacc.c */
-#line 278 "ASN1.y"
+#line 277 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 62:
/* Line 1455 of yacc.c */
-#line 280 "ASN1.y"
+#line 279 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 63:
/* Line 1455 of yacc.c */
-#line 281 "ASN1.y"
+#line 280 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 64:
/* Line 1455 of yacc.c */
-#line 282 "ASN1.y"
+#line 281 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 65:
/* Line 1455 of yacc.c */
-#line 283 "ASN1.y"
+#line 282 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 66:
/* Line 1455 of yacc.c */
-#line 284 "ASN1.y"
+#line 283 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 67:
/* Line 1455 of yacc.c */
-#line 285 "ASN1.y"
+#line 284 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 68:
/* Line 1455 of yacc.c */
-#line 286 "ASN1.y"
+#line 285 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 69:
/* Line 1455 of yacc.c */
-#line 287 "ASN1.y"
+#line 286 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 70:
/* Line 1455 of yacc.c */
-#line 288 "ASN1.y"
+#line 287 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_NULL);}
break;
case 71:
/* Line 1455 of yacc.c */
-#line 291 "ASN1.y"
+#line 290 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 72:
/* Line 1455 of yacc.c */
-#line 292 "ASN1.y"
+#line 291 "ASN1.y"
{(yyval.node)=_asn1_mod_type((yyvsp[(2) - (2)].node),CONST_TAG);
_asn1_set_right((yyvsp[(1) -
(2)].node),_asn1_get_down((yyval.node)));
_asn1_set_down((yyval.node),(yyvsp[(1) - (2)].node));}
@@ -2154,14 +2153,14 @@ yyreduce:
case 73:
/* Line 1455 of yacc.c */
-#line 297 "ASN1.y"
+#line 296 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 74:
/* Line 1455 of yacc.c */
-#line 298 "ASN1.y"
+#line 297 "ASN1.y"
{(yyval.node)=_asn1_mod_type((yyvsp[(1) - (2)].node),CONST_DEFAULT);
_asn1_set_right((yyvsp[(2) - (2)].node),_asn1_get_down((yyval.node)));
_asn1_set_down((yyval.node),(yyvsp[(2) - (2)].node));}
@@ -2170,28 +2169,28 @@ yyreduce:
case 75:
/* Line 1455 of yacc.c */
-#line 301 "ASN1.y"
+#line 300 "ASN1.y"
{(yyval.node)=_asn1_mod_type((yyvsp[(1) - (2)].node),CONST_OPTION);}
break;
case 76:
/* Line 1455 of yacc.c */
-#line 304 "ASN1.y"
+#line 303 "ASN1.y"
{(yyval.node)=_asn1_set_name((yyvsp[(2) - (2)].node),(yyvsp[(1) -
(2)].str));}
break;
case 77:
/* Line 1455 of yacc.c */
-#line 307 "ASN1.y"
+#line 306 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 78:
/* Line 1455 of yacc.c */
-#line 308 "ASN1.y"
+#line 307 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (3)].node);
_asn1_set_right(_asn1_get_last_right((yyvsp[(1) - (3)].node)),(yyvsp[(3) -
(3)].node));}
break;
@@ -2199,7 +2198,7 @@ yyreduce:
case 79:
/* Line 1455 of yacc.c */
-#line 312 "ASN1.y"
+#line 311 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_SEQUENCE);
_asn1_set_down((yyval.node),(yyvsp[(3) - (4)].node));}
break;
@@ -2207,7 +2206,7 @@ yyreduce:
case 80:
/* Line 1455 of yacc.c */
-#line 314 "ASN1.y"
+#line 313 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_SEQUENCE_OF);
_asn1_set_down((yyval.node),(yyvsp[(3) - (3)].node));}
break;
@@ -2215,7 +2214,7 @@ yyreduce:
case 81:
/* Line 1455 of yacc.c */
-#line 316 "ASN1.y"
+#line 315 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_SEQUENCE_OF|CONST_SIZE);
_asn1_set_right((yyvsp[(2) -
(4)].node),(yyvsp[(4) - (4)].node));
_asn1_set_down((yyval.node),(yyvsp[(2) - (4)].node));}
@@ -2224,7 +2223,7 @@ yyreduce:
case 82:
/* Line 1455 of yacc.c */
-#line 321 "ASN1.y"
+#line 320 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_SET);
_asn1_set_down((yyval.node),(yyvsp[(3) -
(4)].node));}
break;
@@ -2232,7 +2231,7 @@ yyreduce:
case 83:
/* Line 1455 of yacc.c */
-#line 323 "ASN1.y"
+#line 322 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_SET_OF);
_asn1_set_down((yyval.node),(yyvsp[(3) -
(3)].node));}
break;
@@ -2240,7 +2239,7 @@ yyreduce:
case 84:
/* Line 1455 of yacc.c */
-#line 325 "ASN1.y"
+#line 324 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_SET_OF|CONST_SIZE);
_asn1_set_right((yyvsp[(2) -
(4)].node),(yyvsp[(4) - (4)].node));
_asn1_set_down((yyval.node),(yyvsp[(2)
- (4)].node));}
@@ -2249,7 +2248,7 @@ yyreduce:
case 85:
/* Line 1455 of yacc.c */
-#line 330 "ASN1.y"
+#line 329 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_CHOICE);
_asn1_set_down((yyval.node),(yyvsp[(3) - (4)].node));}
break;
@@ -2257,14 +2256,14 @@ yyreduce:
case 86:
/* Line 1455 of yacc.c */
-#line 334 "ASN1.y"
+#line 333 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_ANY);}
break;
case 87:
/* Line 1455 of yacc.c */
-#line 335 "ASN1.y"
+#line 334 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_ANY|CONST_DEFINED_BY);
_asn1_set_down((yyval.node),_asn1_add_node(TYPE_CONSTANT));
_asn1_set_name(_asn1_get_down((yyval.node)),(yyvsp[(4) - (4)].str));}
@@ -2273,14 +2272,14 @@ yyreduce:
case 88:
/* Line 1455 of yacc.c */
-#line 340 "ASN1.y"
+#line 339 "ASN1.y"
{(yyval.node)=_asn1_set_name((yyvsp[(3) - (3)].node),(yyvsp[(1) -
(3)].str));}
break;
case 89:
/* Line 1455 of yacc.c */
-#line 344 "ASN1.y"
+#line 343 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_OBJECT_ID|CONST_ASSIGN);
_asn1_set_name((yyval.node),(yyvsp[(1) - (7)].str));
_asn1_set_down((yyval.node),(yyvsp[(6) - (7)].node));}
@@ -2289,7 +2288,7 @@ yyreduce:
case 90:
/* Line 1455 of yacc.c */
-#line 348 "ASN1.y"
+#line 347 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_OBJECT_ID|CONST_ASSIGN|CONST_1_PARAM);
_asn1_set_name((yyval.node),(yyvsp[(1) - (6)].str));
_asn1_set_value((yyval.node),(yyvsp[(2) -
(6)].str),strlen((yyvsp[(2) - (6)].str))+1);
@@ -2299,7 +2298,7 @@ yyreduce:
case 91:
/* Line 1455 of yacc.c */
-#line 353 "ASN1.y"
+#line 352 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_INTEGER|CONST_ASSIGN);
_asn1_set_name((yyval.node),(yyvsp[(1) - (4)].str));
_asn1_set_value((yyval.node),(yyvsp[(4) -
(4)].str),strlen((yyvsp[(4) - (4)].str))+1);}
@@ -2308,28 +2307,28 @@ yyreduce:
case 92:
/* Line 1455 of yacc.c */
-#line 358 "ASN1.y"
+#line 357 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 93:
/* Line 1455 of yacc.c */
-#line 359 "ASN1.y"
+#line 358 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 94:
/* Line 1455 of yacc.c */
-#line 362 "ASN1.y"
+#line 361 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (1)].node);}
break;
case 95:
/* Line 1455 of yacc.c */
-#line 363 "ASN1.y"
+#line 362 "ASN1.y"
{(yyval.node)=(yyvsp[(1) - (2)].node);
_asn1_set_right(_asn1_get_last_right((yyvsp[(1) - (2)].node)),(yyvsp[(2) -
(2)].node));}
break;
@@ -2337,7 +2336,7 @@ yyreduce:
case 96:
/* Line 1455 of yacc.c */
-#line 367 "ASN1.y"
+#line 366 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_OBJECT_ID);
_asn1_set_down((yyval.node),(yyvsp[(3) - (4)].node));
_asn1_set_name((yyval.node),(yyvsp[(1) - (4)].str));}
@@ -2346,7 +2345,7 @@ yyreduce:
case 97:
/* Line 1455 of yacc.c */
-#line 370 "ASN1.y"
+#line 369 "ASN1.y"
{(yyval.node)=_asn1_add_node(TYPE_OBJECT_ID);
_asn1_set_name((yyval.node),(yyvsp[(1) - (3)].str));}
break;
@@ -2354,21 +2353,21 @@ yyreduce:
case 98:
/* Line 1455 of yacc.c */
-#line 394 "ASN1.y"
+#line 393 "ASN1.y"
{(yyval.constant)=CONST_EXPLICIT;}
break;
case 99:
/* Line 1455 of yacc.c */
-#line 395 "ASN1.y"
+#line 394 "ASN1.y"
{(yyval.constant)=CONST_IMPLICIT;}
break;
/* Line 1455 of yacc.c */
-#line 2372 "ASN1.c"
+#line 2371 "ASN1.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2580,7 +2579,7 @@ yyreturn:
/* Line 1675 of yacc.c */
-#line 399 "ASN1.y"
+#line 398 "ASN1.y"
@@ -2689,7 +2688,6 @@ _asn1_yylex()
}
}
-
/*************************************************************/
/* Function: _asn1_create_errorDescription */
/* Description: creates a string with the description of the*/
@@ -2742,36 +2740,35 @@ _asn1_create_errorDescription(int error,char
*errorDescription)
}
-
/**
- * asn1_parser2tree - function used to start the parse algorithm.
- * @file_name: specify the path and the name of file that contains
- * ASN.1 declarations.
- * @definitions: return the pointer to the structure created from
- * "file_name" ASN.1 declarations.
- * @errorDescription: return the error description or an empty
- * string if success.
- *
- * Creates the structures needed to manage the definitions included
- * in *FILE_NAME file.
- *
- * Returns:
- *
- * ASN1_SUCCESS: The file has a correct syntax and every identifier
- * is known.
- *
- * ASN1_ELEMENT_NOT_EMPTY: *POINTER not ASN1_TYPE_EMPTY.
- *
- * ASN1_FILE_NOT_FOUND: An error occured while opening FILE_NAME.
- *
- * ASN1_SYNTAX_ERROR: The syntax is not correct.
- *
- * ASN1_IDENTIFIER_NOT_FOUND: In the file there is an identifier that
- * is not defined.
- *
- * ASN1_NAME_TOO_LONG: In the file there is an identifier whith more
- * than ASN1_MAX_NAME_SIZE characters.
- **/
+ * asn1_parser2tree:
+ * @file_name: specify the path and the name of file that contains
+ * ASN.1 declarations.
+ * @definitions: return the pointer to the structure created from
+ * "file_name" ASN.1 declarations.
+ * @errorDescription: return the error description or an empty
+ * string if success.
+ *
+ * Function used to start the parse algorithm. Creates the structures
+ * needed to manage the definitions included in @file_name file.
+ *
+ * Returns:
+ *
+ * %ASN1_SUCCESS: The file has a correct syntax and every identifier
+ * is known.
+ *
+ * %ASN1_ELEMENT_NOT_EMPTY: *POINTER not ASN1_TYPE_EMPTY.
+ *
+ * %ASN1_FILE_NOT_FOUND: An error occured while opening FILE_NAME.
+ *
+ * %ASN1_SYNTAX_ERROR: The syntax is not correct.
+ *
+ * %ASN1_IDENTIFIER_NOT_FOUND: In the file there is an identifier that
+ * is not defined.
+ *
+ * %ASN1_NAME_TOO_LONG: In the file there is an identifier whith more
+ * than ASN1_MAX_NAME_SIZE characters.
+ **/
asn1_retCode
asn1_parser2tree(const char *file_name, ASN1_TYPE *definitions,
char *errorDescription){
@@ -2831,38 +2828,38 @@ asn1_parser2tree(const char *file_name, ASN1_TYPE
*definitions,
return result_parse;
}
-
/**
- * asn1_parser2array - function that generates a C structure from an ASN1 file
- * @inputFileName: specify the path and the name of file that
- * contains ASN.1 declarations.
- * @outputFileName: specify the path and the name of file that will
- * contain the C vector definition.
- * @vectorName: specify the name of the C vector.
- * @errorDescription : return the error description or an empty
- * string if success.
- *
- * Creates a file containing a C vector to use to manage the
- * definitions included in *INPUTFILENAME file. If *INPUTFILENAME is
- * "/aa/bb/xx.yy" and OUTPUTFILENAME is NULL, the file created is
- * "/aa/bb/xx_asn1_tab.c". If VECTORNAME is NULL the vector name
- * will be "xx_asn1_tab".
- *
- * Returns:
- *
- * ASN1_SUCCESS: The file has a correct syntax and every identifier
- * is known.
- *
- * ASN1_FILE_NOT_FOUND: An error occured while opening FILE_NAME.
- *
- * ASN1_SYNTAX_ERROR: The syntax is not correct.
- *
- * ASN1_IDENTIFIER_NOT_FOUND: In the file there is an identifier that
- * is not defined.
- *
- * ASN1_NAME_TOO_LONG: In the file there is an identifier whith more
- * than ASN1_MAX_NAME_SIZE characters.
- **/
+ * asn1_parser2array:
+ * @inputFileName: specify the path and the name of file that
+ * contains ASN.1 declarations.
+ * @outputFileName: specify the path and the name of file that will
+ * contain the C vector definition.
+ * @vectorName: specify the name of the C vector.
+ * @errorDescription : return the error description or an empty
+ * string if success.
+ *
+ * Function that generates a C structure from an ASN1 file. Creates a
+ * file containing a C vector to use to manage the definitions
+ * included in @inputFileName file. If @inputFileName is
+ * "/aa/bb/xx.yy" and @outputFileName is %NULL, the file created is
+ * "/aa/bb/xx_asn1_tab.c". If @vectorName is %NULL the vector name
+ * will be "xx_asn1_tab".
+ *
+ * Returns:
+ *
+ * %ASN1_SUCCESS: The file has a correct syntax and every identifier
+ * is known.
+ *
+ * %ASN1_FILE_NOT_FOUND: An error occured while opening FILE_NAME.
+ *
+ * %ASN1_SYNTAX_ERROR: The syntax is not correct.
+ *
+ * %ASN1_IDENTIFIER_NOT_FOUND: In the file there is an identifier that
+ * is not defined.
+ *
+ * %ASN1_NAME_TOO_LONG: In the file there is an identifier whith more
+ * than ASN1_MAX_NAME_SIZE characters.
+ **/
int asn1_parser2array(const char *inputFileName,const char *outputFileName,
const char *vectorName,char *errorDescription){
char *file_out_name=NULL;
@@ -2959,7 +2956,6 @@ int asn1_parser2array(const char *inputFileName,const
char *outputFileName,
return result_parse;
}
-
/*************************************************************/
/* Function: _asn1_yyerror */
/* Description: function called when there are syntax errors*/
diff --git a/lib/ASN1.y b/lib/ASN1.y
index 76afbb4..856c8a4 100644
--- a/lib/ASN1.y
+++ b/lib/ASN1.y
@@ -21,7 +21,6 @@
* 02110-1301, USA
*/
-
/*****************************************************/
/* File: x509_ASN.y */
/* Description: input file for 'bison' program. */
@@ -504,7 +503,6 @@ _asn1_yylex()
}
}
-
/*************************************************************/
/* Function: _asn1_create_errorDescription */
/* Description: creates a string with the description of the*/
@@ -557,36 +555,35 @@ _asn1_create_errorDescription(int error,char
*errorDescription)
}
-
/**
- * asn1_parser2tree - function used to start the parse algorithm.
- * @file_name: specify the path and the name of file that contains
- * ASN.1 declarations.
- * @definitions: return the pointer to the structure created from
- * "file_name" ASN.1 declarations.
- * @errorDescription: return the error description or an empty
- * string if success.
- *
- * Creates the structures needed to manage the definitions included
- * in *FILE_NAME file.
- *
- * Returns:
- *
- * ASN1_SUCCESS: The file has a correct syntax and every identifier
- * is known.
- *
- * ASN1_ELEMENT_NOT_EMPTY: *POINTER not ASN1_TYPE_EMPTY.
- *
- * ASN1_FILE_NOT_FOUND: An error occured while opening FILE_NAME.
- *
- * ASN1_SYNTAX_ERROR: The syntax is not correct.
- *
- * ASN1_IDENTIFIER_NOT_FOUND: In the file there is an identifier that
- * is not defined.
- *
- * ASN1_NAME_TOO_LONG: In the file there is an identifier whith more
- * than ASN1_MAX_NAME_SIZE characters.
- **/
+ * asn1_parser2tree:
+ * @file_name: specify the path and the name of file that contains
+ * ASN.1 declarations.
+ * @definitions: return the pointer to the structure created from
+ * "file_name" ASN.1 declarations.
+ * @errorDescription: return the error description or an empty
+ * string if success.
+ *
+ * Function used to start the parse algorithm. Creates the structures
+ * needed to manage the definitions included in @file_name file.
+ *
+ * Returns:
+ *
+ * %ASN1_SUCCESS: The file has a correct syntax and every identifier
+ * is known.
+ *
+ * %ASN1_ELEMENT_NOT_EMPTY: *POINTER not ASN1_TYPE_EMPTY.
+ *
+ * %ASN1_FILE_NOT_FOUND: An error occured while opening FILE_NAME.
+ *
+ * %ASN1_SYNTAX_ERROR: The syntax is not correct.
+ *
+ * %ASN1_IDENTIFIER_NOT_FOUND: In the file there is an identifier that
+ * is not defined.
+ *
+ * %ASN1_NAME_TOO_LONG: In the file there is an identifier whith more
+ * than ASN1_MAX_NAME_SIZE characters.
+ **/
asn1_retCode
asn1_parser2tree(const char *file_name, ASN1_TYPE *definitions,
char *errorDescription){
@@ -646,38 +643,38 @@ asn1_parser2tree(const char *file_name, ASN1_TYPE
*definitions,
return result_parse;
}
-
/**
- * asn1_parser2array - function that generates a C structure from an ASN1 file
- * @inputFileName: specify the path and the name of file that
- * contains ASN.1 declarations.
- * @outputFileName: specify the path and the name of file that will
- * contain the C vector definition.
- * @vectorName: specify the name of the C vector.
- * @errorDescription : return the error description or an empty
- * string if success.
- *
- * Creates a file containing a C vector to use to manage the
- * definitions included in *INPUTFILENAME file. If *INPUTFILENAME is
- * "/aa/bb/xx.yy" and OUTPUTFILENAME is NULL, the file created is
- * "/aa/bb/xx_asn1_tab.c". If VECTORNAME is NULL the vector name
- * will be "xx_asn1_tab".
- *
- * Returns:
- *
- * ASN1_SUCCESS: The file has a correct syntax and every identifier
- * is known.
- *
- * ASN1_FILE_NOT_FOUND: An error occured while opening FILE_NAME.
- *
- * ASN1_SYNTAX_ERROR: The syntax is not correct.
- *
- * ASN1_IDENTIFIER_NOT_FOUND: In the file there is an identifier that
- * is not defined.
- *
- * ASN1_NAME_TOO_LONG: In the file there is an identifier whith more
- * than ASN1_MAX_NAME_SIZE characters.
- **/
+ * asn1_parser2array:
+ * @inputFileName: specify the path and the name of file that
+ * contains ASN.1 declarations.
+ * @outputFileName: specify the path and the name of file that will
+ * contain the C vector definition.
+ * @vectorName: specify the name of the C vector.
+ * @errorDescription : return the error description or an empty
+ * string if success.
+ *
+ * Function that generates a C structure from an ASN1 file. Creates a
+ * file containing a C vector to use to manage the definitions
+ * included in @inputFileName file. If @inputFileName is
+ * "/aa/bb/xx.yy" and @outputFileName is %NULL, the file created is
+ * "/aa/bb/xx_asn1_tab.c". If @vectorName is %NULL the vector name
+ * will be "xx_asn1_tab".
+ *
+ * Returns:
+ *
+ * %ASN1_SUCCESS: The file has a correct syntax and every identifier
+ * is known.
+ *
+ * %ASN1_FILE_NOT_FOUND: An error occured while opening FILE_NAME.
+ *
+ * %ASN1_SYNTAX_ERROR: The syntax is not correct.
+ *
+ * %ASN1_IDENTIFIER_NOT_FOUND: In the file there is an identifier that
+ * is not defined.
+ *
+ * %ASN1_NAME_TOO_LONG: In the file there is an identifier whith more
+ * than ASN1_MAX_NAME_SIZE characters.
+ **/
int asn1_parser2array(const char *inputFileName,const char *outputFileName,
const char *vectorName,char *errorDescription){
char *file_out_name=NULL;
@@ -774,7 +771,6 @@ int asn1_parser2array(const char *inputFileName,const char
*outputFileName,
return result_parse;
}
-
/*************************************************************/
/* Function: _asn1_yyerror */
/* Description: function called when there are syntax errors*/
diff --git a/lib/coding.c b/lib/coding.c
index 11df3fc..9a28b12 100644
--- a/lib/coding.c
+++ b/lib/coding.c
@@ -843,32 +843,31 @@ _asn1_ordering_set_of (unsigned char *der, int der_len,
ASN1_TYPE node)
}
/**
- * asn1_der_coding - Creates the DER encoding for the NAME structure
- * @element: pointer to an ASN1 element
- * @name: the name of the structure you want to encode (it must be
- * inside *POINTER).
- * @ider: vector that will contain the DER encoding. DER must be a
- * pointer to memory cells already allocated.
- * @len: number of bytes of address@hidden: @address@hidden, Initialy
- * holds the sizeof of der vector.
- * @errorDescription : return the error description or an empty
- * string if success.
- *
- * Creates the DER encoding for the NAME structure (inside *POINTER
- * structure).
- *
- * Returns:
- *
- * ASN1_SUCCESS: DER encoding OK.
- *
- * ASN1_ELEMENT_NOT_FOUND: NAME is not a valid element.
- *
- * ASN1_VALUE_NOT_FOUND: There is an element without a value.
- *
- * ASN1_MEM_ERROR: @ider vector isn't big enough. Also in this case
- * LEN will contain the length needed.
- *
- **/
+ * asn1_der_coding:
+ * @element: pointer to an ASN1 element
+ * @name: the name of the structure you want to encode (it must be
+ * inside *POINTER).
+ * @ider: vector that will contain the DER encoding. DER must be a
+ * pointer to memory cells already allocated.
+ * @len: number of bytes of address@hidden: @address@hidden, Initialy
+ * holds the sizeof of der vector.
+ * @errorDescription : return the error description or an empty
+ * string if success.
+ *
+ * Creates the DER encoding for the NAME structure (inside *POINTER
+ * structure).
+ *
+ * Returns:
+ *
+ * %ASN1_SUCCESS: DER encoding OK.
+ *
+ * %ASN1_ELEMENT_NOT_FOUND: NAME is not a valid element.
+ *
+ * %ASN1_VALUE_NOT_FOUND: There is an element without a value.
+ *
+ * %ASN1_MEM_ERROR: @ider vector isn't big enough. Also in this case
+ * LEN will contain the length needed.
+ **/
asn1_retCode
asn1_der_coding (ASN1_TYPE element, const char *name, void *ider, int *len,
char *ErrorDescription)
diff --git a/lib/decoding.c b/lib/decoding.c
index da64510..6875baf 100644
--- a/lib/decoding.c
+++ b/lib/decoding.c
@@ -112,7 +112,7 @@ asn1_get_length_der (const unsigned char *der, int der_len,
int *len)
*
* Decode the class and TAG from DER code.
*
- * Return value: Returns ASN1_SUCCESS on success, or an error.
+ * Return value: Returns %ASN1_SUCCESS on success, or an error.
**/
int
asn1_get_tag_der (const unsigned char *der, int der_len,
@@ -203,7 +203,7 @@ asn1_get_length_ber (const unsigned char *ber, int ber_len,
int *len)
*
* Extract an OCTET SEQUENCE from DER data.
*
- * Return value: Returns ASN1_SUCCESS on success, or an error.
+ * Return value: Returns %ASN1_SUCCESS on success, or an error.
**/
int
asn1_get_octet_der (const unsigned char *der, int der_len,
@@ -328,7 +328,7 @@ _asn1_get_objectid_der (const unsigned char *der, int
der_len, int *ret_len,
*
* Extract a BIT SEQUENCE from DER data.
*
- * Return value: Return ASN1_SUCCESS on success, or an error.
+ * Return value: Return %ASN1_SUCCESS on success, or an error.
**/
int
asn1_get_bit_der (const unsigned char *der, int der_len,
@@ -798,29 +798,28 @@ _asn1_get_indefinite_length_string (const unsigned char
*der, int *len)
/**
- * asn1_der_decoding - Fill the structure *ELEMENT with values of a DER
encoding string.
- * @element: pointer to an ASN1 structure.
- * @ider: vector that contains the DER encoding.
- * @len: number of bytes of address@hidden: @address@hidden
- * @errorDescription: null-terminated string contains details when an
- * error occurred.
- *
- * Fill the structure *ELEMENT with values of a DER encoding
- * string. The structure must just be created with function
- * 'asn1_create_element'. If an error occurs during the decoding
- * procedure, the *ELEMENT is deleted and set equal to
- * %ASN1_TYPE_EMPTY.
- *
- * Returns:
- *
- * ASN1_SUCCESS: DER encoding OK.
- *
- * ASN1_ELEMENT_NOT_FOUND: ELEMENT is ASN1_TYPE_EMPTY.
- *
- * ASN1_TAG_ERROR,ASN1_DER_ERROR: The der encoding doesn't match
- * the structure NAME. *ELEMENT deleted.
- **/
-
+ * asn1_der_decoding:
+ * @element: pointer to an ASN1 structure.
+ * @ider: vector that contains the DER encoding.
+ * @len: number of bytes of address@hidden: @address@hidden
+ * @errorDescription: null-terminated string contains details when an
+ * error occurred.
+ *
+ * Fill the structure *ELEMENT with values of a DER encoding
+ * string. The structure must just be created with function
+ * 'asn1_create_element'. If an error occurs during the decoding
+ * procedure, the *ELEMENT is deleted and set equal to
+ * %ASN1_TYPE_EMPTY.
+ *
+ * Returns:
+ *
+ * %ASN1_SUCCESS: DER encoding OK.
+ *
+ * %ASN1_ELEMENT_NOT_FOUND: ELEMENT is ASN1_TYPE_EMPTY.
+ *
+ * %ASN1_TAG_ERROR,ASN1_DER_ERROR: The der encoding doesn't match
+ * the structure NAME. *ELEMENT deleted.
+ **/
asn1_retCode
asn1_der_decoding (ASN1_TYPE * element, const void *ider, int len,
char *errorDescription)
@@ -1355,32 +1354,31 @@ asn1_der_decoding (ASN1_TYPE * element, const void
*ider, int len,
#define EXIT 4
/**
- * asn1_der_decoding_element - Fill the element named ELEMENTNAME of the
structure STRUCTURE with values of a DER encoding string.
- * @structure: pointer to an ASN1 structure
- * @elementName: name of the element to fill
- * @ider: vector that contains the DER encoding of the whole structure.
- * @len: number of bytes of *der: der[0]..der[len-1]
- * @errorDescription: null-terminated string contains details when an
- * error occurred.
- *
- * Fill the element named ELEMENTNAME with values of a DER encoding
- * string. The structure must just be created with function
- * 'asn1_create_element'. The DER vector must contain the encoding
- * string of the whole STRUCTURE. If an error occurs during the
- * decoding procedure, the *STRUCTURE is deleted and set equal to
- * %ASN1_TYPE_EMPTY.
- *
- * Returns:
- *
- * ASN1_SUCCESS: DER encoding OK.
- *
- * ASN1_ELEMENT_NOT_FOUND: ELEMENT is ASN1_TYPE_EMPTY or
- * elementName == NULL.
- *
- * ASN1_TAG_ERROR,ASN1_DER_ERROR: The der encoding doesn't match
- * the structure STRUCTURE. *ELEMENT deleted.
- *
- **/
+ * asn1_der_decoding_element:
+ * @structure: pointer to an ASN1 structure
+ * @elementName: name of the element to fill
+ * @ider: vector that contains the DER encoding of the whole structure.
+ * @len: number of bytes of *der: der[0]..der[len-1]
+ * @errorDescription: null-terminated string contains details when an
+ * error occurred.
+ *
+ * Fill the element named ELEMENTNAME with values of a DER encoding
+ * string. The structure must just be created with function
+ * 'asn1_create_element'. The DER vector must contain the encoding
+ * string of the whole STRUCTURE. If an error occurs during the
+ * decoding procedure, the *STRUCTURE is deleted and set equal to
+ * %ASN1_TYPE_EMPTY.
+ *
+ * Returns:
+ *
+ * %ASN1_SUCCESS: DER encoding OK.
+ *
+ * %ASN1_ELEMENT_NOT_FOUND: ELEMENT is ASN1_TYPE_EMPTY or
+ * elementName == NULL.
+ *
+ * %ASN1_TAG_ERROR,ASN1_DER_ERROR: The der encoding doesn't match
+ * the structure STRUCTURE. *ELEMENT deleted.
+ **/
asn1_retCode
asn1_der_decoding_element (ASN1_TYPE * structure, const char *elementName,
const void *ider, int len, char *errorDescription)
@@ -2128,35 +2126,34 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const
char *elementName,
/**
- * asn1_der_decoding_startEnd - Find the start and end point of an element in
a DER encoding string.
- * @element: pointer to an ASN1 element
- * @ider: vector that contains the DER encoding.
- * @len: number of bytes of address@hidden: @address@hidden
- * @name_element: an element of NAME structure.
- * @start: the position of the first byte of NAME_ELEMENT decoding
- * (@ider[*start])
- * @end: the position of the last byte of NAME_ELEMENT decoding
- * (@ider[*end])
- *
- * Find the start and end point of an element in a DER encoding
- * string. I mean that if you have a der encoding and you have
- * already used the function "asn1_der_decoding" to fill a structure,
- * it may happen that you want to find the piece of string concerning
- * an element of the structure.
- *
- * Example: the sequence "tbsCertificate" inside an X509 certificate.
- *
- * Returns:
- *
- * ASN1_SUCCESS: DER encoding OK.
- *
- * ASN1_ELEMENT_NOT_FOUND: ELEMENT is ASN1_TYPE EMPTY or
- * NAME_ELEMENT is not a valid element.
- *
- * ASN1_TAG_ERROR,ASN1_DER_ERROR: the der encoding doesn't match
- * the structure ELEMENT.
- *
- **/
+ * asn1_der_decoding_startEnd:
+ * @element: pointer to an ASN1 element
+ * @ider: vector that contains the DER encoding.
+ * @len: number of bytes of address@hidden: @address@hidden
+ * @name_element: an element of NAME structure.
+ * @start: the position of the first byte of NAME_ELEMENT decoding
+ * (@ider[*start])
+ * @end: the position of the last byte of NAME_ELEMENT decoding
+ * (@ider[*end])
+ *
+ * Find the start and end point of an element in a DER encoding
+ * string. I mean that if you have a der encoding and you have already
+ * used the function "asn1_der_decoding" to fill a structure, it may
+ * happen that you want to find the piece of string concerning an
+ * element of the structure.
+ *
+ * Example: the sequence "tbsCertificate" inside an X509 certificate.
+ *
+ * Returns:
+ *
+ * %ASN1_SUCCESS: DER encoding OK.
+ *
+ * %ASN1_ELEMENT_NOT_FOUND: ELEMENT is ASN1_TYPE EMPTY or
+ * NAME_ELEMENT is not a valid element.
+ *
+ * %ASN1_TAG_ERROR,ASN1_DER_ERROR: the der encoding doesn't match
+ * the structure ELEMENT.
+ **/
asn1_retCode
asn1_der_decoding_startEnd (ASN1_TYPE element, const void *ider, int len,
const char *name_element, int *start, int *end)
@@ -2480,27 +2477,25 @@ asn1_der_decoding_startEnd (ASN1_TYPE element, const
void *ider, int len,
/**
- * asn1_expand_any_defined_by - Expand "ANY DEFINED BY" fields in structure.
- * @definitions: ASN1 definitions
- * @element: pointer to an ASN1 structure
- *
- * Expands every "ANY DEFINED BY" element of a structure created from
- * a DER decoding process (asn1_der_decoding function). The element ANY
- * must be defined by an OBJECT IDENTIFIER. The type used to expand
- * the element ANY is the first one following the definition of
- * the actual value of the OBJECT IDENTIFIER.
- *
- *
- * Returns:
- *
- * ASN1_SUCCESS: Substitution OK.
- *
- * ASN1_ERROR_TYPE_ANY: Some "ANY DEFINED BY" element couldn't be
- * expanded due to a problem in OBJECT_ID -> TYPE association.
- *
- * other errors: Result of der decoding process.
- **/
-
+ * asn1_expand_any_defined_by:
+ * @definitions: ASN1 definitions
+ * @element: pointer to an ASN1 structure
+ *
+ * Expands every "ANY DEFINED BY" element of a structure created from
+ * a DER decoding process (asn1_der_decoding function). The element
+ * ANY must be defined by an OBJECT IDENTIFIER. The type used to
+ * expand the element ANY is the first one following the definition of
+ * the actual value of the OBJECT IDENTIFIER.
+ *
+ * Returns:
+ *
+ * %ASN1_SUCCESS: Substitution OK.
+ *
+ * %ASN1_ERROR_TYPE_ANY: Some "ANY DEFINED BY" element couldn't be
+ * expanded due to a problem in OBJECT_ID -> TYPE association.
+ *
+ * other errors: Result of der decoding process.
+ **/
asn1_retCode
asn1_expand_any_defined_by (ASN1_TYPE definitions, ASN1_TYPE * element)
{
@@ -2716,29 +2711,29 @@ asn1_expand_any_defined_by (ASN1_TYPE definitions,
ASN1_TYPE * element)
/**
- * asn1_expand_octet_string - Expand "OCTET STRING" fields in structure.
- * @definitions: ASN1 definitions
- * @element: pointer to an ASN1 structure
- * @octetName: name of the OCTECT STRING field to expand.
- * @objectName: name of the OBJECT IDENTIFIER field to use to define
- * the type for expansion.
- *
- * Expands an "OCTET STRING" element of a structure created from a
- * DER decoding process (asn1_der_decoding function). The type used
- * for expansion is the first one following the definition of the
- * actual value of the OBJECT IDENTIFIER indicated by OBJECTNAME.
- *
- * Returns:
- *
- * ASN1_SUCCESS: Substitution OK.
- *
- * ASN1_ELEMENT_NOT_FOUND: OBJECTNAME or OCTETNAME are not correct.
- *
- * ASN1_VALUE_NOT_VALID: Wasn't possible to find the type to use
- * for expansion.
- *
- * other errors: result of der decoding process.
- **/
+ * asn1_expand_octet_string:
+ * @definitions: ASN1 definitions
+ * @element: pointer to an ASN1 structure
+ * @octetName: name of the OCTECT STRING field to expand.
+ * @objectName: name of the OBJECT IDENTIFIER field to use to define
+ * the type for expansion.
+ *
+ * Expands an "OCTET STRING" element of a structure created from a DER
+ * decoding process (asn1_der_decoding function). The type used for
+ * expansion is the first one following the definition of the actual
+ * value of the OBJECT IDENTIFIER indicated by OBJECTNAME.
+ *
+ * Returns:
+ *
+ * %ASN1_SUCCESS: Substitution OK.
+ *
+ * %ASN1_ELEMENT_NOT_FOUND: @objectName or @octetName are not correct.
+ *
+ * %ASN1_VALUE_NOT_VALID: Wasn't possible to find the type to use
+ * for expansion.
+ *
+ * other errors: result of der decoding process.
+ **/
asn1_retCode
asn1_expand_octet_string (ASN1_TYPE definitions, ASN1_TYPE * element,
const char *octetName, const char *objectName)
diff --git a/lib/element.c b/lib/element.c
index 09a6a9f..51ade14 100644
--- a/lib/element.c
+++ b/lib/element.c
@@ -163,116 +163,115 @@ _asn1_append_sequence_set (ASN1_TYPE node)
/**
- * asn1_write_value - Set the value of one element inside a structure.
- * @node_root: pointer to a structure
- * @name: the name of the element inside the structure that you want to set.
- * @ivalue: vector used to specify the value to set. If len is >0,
- * VALUE must be a two's complement form integer. if len=0 *VALUE
- * must be a null terminated string with an integer value.
- * @len: number of bytes of *value to use to set the value:
- * value[0]..value[len-1] or 0 if value is a null terminated string
- *
- * Set the value of one element inside a structure.
- *
- * If an element is OPTIONAL and you want to delete it, you must use
- * the value=NULL and len=0. Using "pkix.asn":
- *
- * result=asn1_write_value(cert, "tbsCertificate.issuerUniqueID",
- * NULL, 0);
- *
- * Description for each type:
- *
- * INTEGER: VALUE must contain a two's complement form integer.
- *
- * value[0]=0xFF , len=1 -> integer=-1.
- * value[0]=0xFF value[1]=0xFF , len=2 -> integer=-1.
- * value[0]=0x01 , len=1 -> integer= 1.
- * value[0]=0x00 value[1]=0x01 , len=2 -> integer= 1.
- * value="123" , len=0 -> integer= 123.
- *
- * ENUMERATED: As INTEGER (but only with not negative numbers).
- *
- * BOOLEAN: VALUE must be the null terminated string "TRUE" or
- * "FALSE" and LEN != 0.
- *
- * value="TRUE" , len=1 -> boolean=TRUE.
- * value="FALSE" , len=1 -> boolean=FALSE.
- *
- * OBJECT IDENTIFIER: VALUE must be a null terminated string with
- * each number separated by a dot (e.g. "1.2.3.543.1"). LEN != 0.
- *
- * value="1 2 840 10040 4 3" , len=1 -> OID=dsa-with-sha.
- *
- * UTCTime: VALUE must be a null terminated string in one of these
- * formats: "YYMMDDhhmmssZ", "YYMMDDhhmmssZ",
- * "YYMMDDhhmmss+hh'mm'", "YYMMDDhhmmss-hh'mm'",
- * "YYMMDDhhmm+hh'mm'", or "YYMMDDhhmm-hh'mm'". LEN != 0.
- *
- * value="9801011200Z" , len=1 -> time=Jannuary 1st, 1998
- * at 12h 00m Greenwich Mean Time
- *
- * GeneralizedTime: VALUE must be in one of this format:
- * "YYYYMMDDhhmmss.sZ", "YYYYMMDDhhmmss.sZ",
- * "YYYYMMDDhhmmss.s+hh'mm'", "YYYYMMDDhhmmss.s-hh'mm'",
- * "YYYYMMDDhhmm+hh'mm'", or "YYYYMMDDhhmm-hh'mm'" where ss.s
- * indicates the seconds with any precision like "10.1" or "01.02".
- * LEN != 0
- *
- * value="2001010112001.12-0700" , len=1 -> time=Jannuary
- * 1st, 2001 at 12h 00m 01.12s Pacific Daylight Time
- *
- * OCTET STRING: VALUE contains the octet string and LEN is the
- * number of octets.
- *
- * value="$\backslash$x01$\backslash$x02$\backslash$x03" ,
- * len=3 -> three bytes octet string
- *
- * GeneralString: VALUE contains the generalstring and LEN is the
- * number of octets.
- *
- * value="$\backslash$x01$\backslash$x02$\backslash$x03" ,
- * len=3 -> three bytes generalstring
- *
- * BIT STRING: VALUE contains the bit string organized by bytes and
- * LEN is the number of bits.
- *
- * value="$\backslash$xCF" , len=6 -> bit string="110011" (six
- * bits)
- *
- * CHOICE: if NAME indicates a choice type, VALUE must specify one of
- * the alternatives with a null terminated string. LEN != 0. Using
- * "pkix.asn"\:
- *
- * result=asn1_write_value(cert,
- * "certificate1.tbsCertificate.subject", "rdnSequence",
- * 1);
- *
- * ANY: VALUE indicates the der encoding of a structure. LEN != 0.
- *
- * SEQUENCE OF: VALUE must be the null terminated string "NEW" and
- * LEN != 0. With this instruction another element is appended in
- * the sequence. The name of this element will be "?1" if it's the
- * first one, "?2" for the second and so on.
- *
- * Using "pkix.asn"\:
- *
- * result=asn1_write_value(cert,
- * "certificate1.tbsCertificate.subject.rdnSequence", "NEW", 1);
- *
- * SET OF: the same as SEQUENCE OF. Using "pkix.asn":
- *
- * result=asn1_write_value(cert,
- * "tbsCertificate.subject.rdnSequence.?LAST", "NEW", 1);
- *
- * Returns:
- *
- * ASN1_SUCCESS: Set value OK.
- *
- * ASN1_ELEMENT_NOT_FOUND: NAME is not a valid element.
- *
- * ASN1_VALUE_NOT_VALID: VALUE has a wrong format.
- *
- **/
+ * asn1_write_value:
+ * @node_root: pointer to a structure
+ * @name: the name of the element inside the structure that you want to set.
+ * @ivalue: vector used to specify the value to set. If len is >0,
+ * VALUE must be a two's complement form integer. if len=0 *VALUE
+ * must be a null terminated string with an integer value.
+ * @len: number of bytes of *value to use to set the value:
+ * value[0]..value[len-1] or 0 if value is a null terminated string
+ *
+ * Set the value of one element inside a structure.
+ *
+ * If an element is OPTIONAL and you want to delete it, you must use
+ * the value=NULL and len=0. Using "pkix.asn":
+ *
+ * result=asn1_write_value(cert, "tbsCertificate.issuerUniqueID",
+ * NULL, 0);
+ *
+ * Description for each type:
+ *
+ * INTEGER: VALUE must contain a two's complement form integer.
+ *
+ * value[0]=0xFF , len=1 -> integer=-1.
+ * value[0]=0xFF value[1]=0xFF , len=2 -> integer=-1.
+ * value[0]=0x01 , len=1 -> integer= 1.
+ * value[0]=0x00 value[1]=0x01 , len=2 -> integer= 1.
+ * value="123" , len=0 -> integer= 123.
+ *
+ * ENUMERATED: As INTEGER (but only with not negative numbers).
+ *
+ * BOOLEAN: VALUE must be the null terminated string "TRUE" or
+ * "FALSE" and LEN != 0.
+ *
+ * value="TRUE" , len=1 -> boolean=TRUE.
+ * value="FALSE" , len=1 -> boolean=FALSE.
+ *
+ * OBJECT IDENTIFIER: VALUE must be a null terminated string with
+ * each number separated by a dot (e.g. "1.2.3.543.1"). LEN != 0.
+ *
+ * value="1 2 840 10040 4 3" , len=1 -> OID=dsa-with-sha.
+ *
+ * UTCTime: VALUE must be a null terminated string in one of these
+ * formats: "YYMMDDhhmmssZ", "YYMMDDhhmmssZ",
+ * "YYMMDDhhmmss+hh'mm'", "YYMMDDhhmmss-hh'mm'",
+ * "YYMMDDhhmm+hh'mm'", or "YYMMDDhhmm-hh'mm'". LEN != 0.
+ *
+ * value="9801011200Z" , len=1 -> time=Jannuary 1st, 1998
+ * at 12h 00m Greenwich Mean Time
+ *
+ * GeneralizedTime: VALUE must be in one of this format:
+ * "YYYYMMDDhhmmss.sZ", "YYYYMMDDhhmmss.sZ",
+ * "YYYYMMDDhhmmss.s+hh'mm'", "YYYYMMDDhhmmss.s-hh'mm'",
+ * "YYYYMMDDhhmm+hh'mm'", or "YYYYMMDDhhmm-hh'mm'" where ss.s
+ * indicates the seconds with any precision like "10.1" or "01.02".
+ * LEN != 0
+ *
+ * value="2001010112001.12-0700" , len=1 -> time=Jannuary
+ * 1st, 2001 at 12h 00m 01.12s Pacific Daylight Time
+ *
+ * OCTET STRING: VALUE contains the octet string and LEN is the
+ * number of octets.
+ *
+ * value="$\backslash$x01$\backslash$x02$\backslash$x03" ,
+ * len=3 -> three bytes octet string
+ *
+ * GeneralString: VALUE contains the generalstring and LEN is the
+ * number of octets.
+ *
+ * value="$\backslash$x01$\backslash$x02$\backslash$x03" ,
+ * len=3 -> three bytes generalstring
+ *
+ * BIT STRING: VALUE contains the bit string organized by bytes and
+ * LEN is the number of bits.
+ *
+ * value="$\backslash$xCF" , len=6 -> bit string="110011" (six
+ * bits)
+ *
+ * CHOICE: if NAME indicates a choice type, VALUE must specify one of
+ * the alternatives with a null terminated string. LEN != 0. Using
+ * "pkix.asn"\:
+ *
+ * result=asn1_write_value(cert,
+ * "certificate1.tbsCertificate.subject", "rdnSequence",
+ * 1);
+ *
+ * ANY: VALUE indicates the der encoding of a structure. LEN != 0.
+ *
+ * SEQUENCE OF: VALUE must be the null terminated string "NEW" and
+ * LEN != 0. With this instruction another element is appended in
+ * the sequence. The name of this element will be "?1" if it's the
+ * first one, "?2" for the second and so on.
+ *
+ * Using "pkix.asn"\:
+ *
+ * result=asn1_write_value(cert,
+ * "certificate1.tbsCertificate.subject.rdnSequence", "NEW", 1);
+ *
+ * SET OF: the same as SEQUENCE OF. Using "pkix.asn":
+ *
+ * result=asn1_write_value(cert,
+ * "tbsCertificate.subject.rdnSequence.?LAST", "NEW", 1);
+ *
+ * Returns:
+ *
+ * %ASN1_SUCCESS: Set value OK.
+ *
+ * %ASN1_ELEMENT_NOT_FOUND: NAME is not a valid element.
+ *
+ * %ASN1_VALUE_NOT_VALID: VALUE has a wrong format.
+ **/
asn1_retCode
asn1_write_value (ASN1_TYPE node_root, const char *name,
const void *ivalue, int len)
@@ -645,71 +644,70 @@ asn1_write_value (ASN1_TYPE node_root, const char *name,
}
/**
- * asn1_read_value - Returns the value of one element inside a structure
- * @root: pointer to a structure.
- * @name: the name of the element inside a structure that you want to read.
- * @ivalue: vector that will contain the element's content, must be a
- * pointer to memory cells already allocated.
- * @len: number of bytes of *value: value[0]..value[len-1]. Initialy
- * holds the sizeof value.
- *
- * Returns the value of one element inside a structure.
- *
- * If an element is OPTIONAL and the function "read_value" returns
- * %ASN1_ELEMENT_NOT_FOUND, it means that this element wasn't present
- * in the der encoding that created the structure. The first element
- * of a SEQUENCE_OF or SET_OF is named "?1". The second one "?2" and
- * so on.
- *
- * INTEGER: VALUE will contain a two's complement form integer.
- *
- * integer=-1 -> value[0]=0xFF , len=1.
- * integer=1 -> value[0]=0x01 , len=1.
- *
- * ENUMERATED: As INTEGER (but only with not negative numbers).
- *
- * BOOLEAN: VALUE will be the null terminated string "TRUE" or
- * "FALSE" and LEN=5 or LEN=6.
- *
- * OBJECT IDENTIFIER: VALUE will be a null terminated string with
- * each number separated by a dot (i.e. "1.2.3.543.1").
- *
- * LEN = strlen(VALUE)+1
- *
- * UTCTime: VALUE will be a null terminated string in one of these
- * formats: "YYMMDDhhmmss+hh'mm'" or "YYMMDDhhmmss-hh'mm'".
- * LEN=strlen(VALUE)+1.
- *
- * GeneralizedTime: VALUE will be a null terminated string in the
- * same format used to set the value.
- *
- * OCTET STRING: VALUE will contain the octet string and LEN will be
- * the number of octets.
- *
- * GeneralString: VALUE will contain the generalstring and LEN will
- * be the number of octets.
- *
- * BIT STRING: VALUE will contain the bit string organized by bytes
- * and LEN will be the number of bits.
- *
- * CHOICE: If NAME indicates a choice type, VALUE will specify the
- * alternative selected.
- *
- * ANY: If NAME indicates an any type, VALUE will indicate the DER
- * encoding of the structure actually used.
- *
- * Returns:
- *
- * ASN1_SUCCESS: Set value OK.
- *
- * ASN1_ELEMENT_NOT_FOUND: NAME is not a valid element.
- *
- * ASN1_VALUE_NOT_FOUND: There isn't any value for the element selected.
- *
- * ASN1_MEM_ERROR: The value vector isn't big enough to store the result.
- * In this case LEN will contain the number of bytes needed.
- *
- **/
+ * asn1_read_value:
+ * @root: pointer to a structure.
+ * @name: the name of the element inside a structure that you want to read.
+ * @ivalue: vector that will contain the element's content, must be a
+ * pointer to memory cells already allocated.
+ * @len: number of bytes of *value: value[0]..value[len-1]. Initialy
+ * holds the sizeof value.
+ *
+ * Returns the value of one element inside a structure.
+ *
+ * If an element is OPTIONAL and the function "read_value" returns
+ * %ASN1_ELEMENT_NOT_FOUND, it means that this element wasn't present
+ * in the der encoding that created the structure. The first element
+ * of a SEQUENCE_OF or SET_OF is named "?1". The second one "?2" and
+ * so on.
+ *
+ * INTEGER: VALUE will contain a two's complement form integer.
+ *
+ * integer=-1 -> value[0]=0xFF , len=1.
+ * integer=1 -> value[0]=0x01 , len=1.
+ *
+ * ENUMERATED: As INTEGER (but only with not negative numbers).
+ *
+ * BOOLEAN: VALUE will be the null terminated string "TRUE" or
+ * "FALSE" and LEN=5 or LEN=6.
+ *
+ * OBJECT IDENTIFIER: VALUE will be a null terminated string with
+ * each number separated by a dot (i.e. "1.2.3.543.1").
+ *
+ * LEN = strlen(VALUE)+1
+ *
+ * UTCTime: VALUE will be a null terminated string in one of these
+ * formats: "YYMMDDhhmmss+hh'mm'" or "YYMMDDhhmmss-hh'mm'".
+ * LEN=strlen(VALUE)+1.
+ *
+ * GeneralizedTime: VALUE will be a null terminated string in the
+ * same format used to set the value.
+ *
+ * OCTET STRING: VALUE will contain the octet string and LEN will be
+ * the number of octets.
+ *
+ * GeneralString: VALUE will contain the generalstring and LEN will
+ * be the number of octets.
+ *
+ * BIT STRING: VALUE will contain the bit string organized by bytes
+ * and LEN will be the number of bits.
+ *
+ * CHOICE: If NAME indicates a choice type, VALUE will specify the
+ * alternative selected.
+ *
+ * ANY: If NAME indicates an any type, VALUE will indicate the DER
+ * encoding of the structure actually used.
+ *
+ * Returns:
+ *
+ * %ASN1_SUCCESS: Set value OK.
+ *
+ * %ASN1_ELEMENT_NOT_FOUND: NAME is not a valid element.
+ *
+ * %ASN1_VALUE_NOT_FOUND: There isn't any value for the element selected.
+ *
+ * %ASN1_MEM_ERROR: The value vector isn't big enough to store the result.
+ * In this case LEN will contain the number of bytes needed.
+ **/
asn1_retCode
asn1_read_value (ASN1_TYPE root, const char *name, void *ivalue, int *len)
{
@@ -874,24 +872,23 @@ asn1_read_value (ASN1_TYPE root, const char *name, void
*ivalue, int *len)
/**
- * asn1_read_tag - Returns the TAG of one element inside a structure
- * @root: pointer to a structure
- * @name: the name of the element inside a structure.
- * @tagValue: variable that will contain the TAG value.
- * @classValue: variable that will specify the TAG type.
- *
- * Returns the TAG and the CLASS of one element inside a structure.
- * CLASS can have one of these constants: %ASN1_CLASS_APPLICATION,
- * %ASN1_CLASS_UNIVERSAL, %ASN1_CLASS_PRIVATE or
- * %ASN1_CLASS_CONTEXT_SPECIFIC.
- *
- * Returns:
- *
- * ASN1_SUCCESS: Set value OK.
- *
- * ASN1_ELEMENT_NOT_FOUND: NAME is not a valid element.
- *
- **/
+ * asn1_read_tag:
+ * @root: pointer to a structure
+ * @name: the name of the element inside a structure.
+ * @tagValue: variable that will contain the TAG value.
+ * @classValue: variable that will specify the TAG type.
+ *
+ * Returns the TAG and the CLASS of one element inside a structure.
+ * CLASS can have one of these constants: %ASN1_CLASS_APPLICATION,
+ * %ASN1_CLASS_UNIVERSAL, %ASN1_CLASS_PRIVATE or
+ * %ASN1_CLASS_CONTEXT_SPECIFIC.
+ *
+ * Returns:
+ *
+ * %ASN1_SUCCESS: Set value OK.
+ *
+ * %ASN1_ELEMENT_NOT_FOUND: NAME is not a valid element.
+ **/
asn1_retCode
asn1_read_tag (ASN1_TYPE root, const char *name, int *tagValue,
int *classValue)
diff --git a/lib/errors.c b/lib/errors.c
index 56d5f08..052c64f 100644
--- a/lib/errors.c
+++ b/lib/errors.c
@@ -57,11 +57,12 @@ static const libtasn1_error_entry error_algorithms[] = {
};
/**
- * asn1_perror - prints a string to stderr with a description of an error
+ * asn1_perror:
* @error: is an error returned by a libtasn1 function.
*
- * This function is like perror(). The only difference is that it
- * accepts an error returned by a libtasn1 function.
+ * Prints a string to stderr with a description of an error. This
+ * function is like perror(). The only difference is that it accepts
+ * an error returned by a libtasn1 function.
*
* This function replaces libtasn1_perror() in older libtasn1.
*
@@ -75,11 +76,12 @@ asn1_perror (asn1_retCode error)
}
/**
- * asn1_strerror - Returns a string with a description of an error
+ * asn1_strerror:
* @error: is an error returned by a libtasn1 function.
*
- * This function is similar to strerror. The only difference is that
- * it accepts an error (number) returned by a libtasn1 function.
+ * Returns a string with a description of an error. This function is
+ * similar to strerror. The only difference is that it accepts an
+ * error (number) returned by a libtasn1 function.
*
* This function replaces libtasn1_strerror() in older libtasn1.
*
@@ -105,11 +107,12 @@ asn1_strerror (asn1_retCode error)
/* Compatibility mappings to preserve ABI. */
/**
- * libtasn1_perror - prints a string to stderr with a description of an error
+ * libtasn1_perror:
* @error: is an error returned by a libtasn1 function.
*
- * This function is like perror(). The only difference is that it
- * accepts an error returned by a libtasn1 function.
+ * Prints a string to stderr with a description of an error. This
+ * function is like perror(). The only difference is that it accepts
+ * an error returned by a libtasn1 function.
*
* Deprecated: Use asn1_perror() instead.
**/
@@ -120,11 +123,12 @@ libtasn1_perror (asn1_retCode error)
}
/**
- * libtasn1_strerror - Returns a string with a description of an error
+ * libtasn1_strerror:
* @error: is an error returned by a libtasn1 function.
*
- * This function is similar to strerror. The only difference is that
- * it accepts an error (number) returned by a libtasn1 function.
+ * Returns a string with a description of an error. This function is
+ * similar to strerror. The only difference is that it accepts an
+ * error (number) returned by a libtasn1 function.
*
* Returns: Pointer to static zero-terminated string describing error
* code.
diff --git a/lib/parser_aux.c b/lib/parser_aux.c
index 5ee2dee..b740a1e 100644
--- a/lib/parser_aux.c
+++ b/lib/parser_aux.c
@@ -1139,7 +1139,7 @@ parse_version_string (const char *s, int *major, int
*minor, int *micro)
}
/**
- * asn1_check_version - check for library version
+ * asn1_check_version:
* @req_version: Required version number, or NULL.
*
* Check that the version of the library is at minimum the
diff --git a/lib/structure.c b/lib/structure.c
index edaafe6..b1c5b30 100644
--- a/lib/structure.c
+++ b/lib/structure.c
@@ -159,26 +159,26 @@ _asn1_create_static_structure (ASN1_TYPE pointer, char
*output_file_name,
/**
- * asn1_array2tree - Creates the structures needed to manage the ASN1
definitions.
- * @array: specify the array that contains ASN.1 declarations
- * @definitions: return the pointer to the structure created by
- * *ARRAY ASN.1 declarations
- * @errorDescription: return the error description.
- *
- * Creates the structures needed to manage the ASN.1 definitions.
- * @array is a vector created by asn1_parser2array().
- *
- * Returns:
- *
- * ASN1_SUCCESS: Structure created correctly.
- *
- * ASN1_ELEMENT_NOT_EMPTY: address@hidden not ASN1_TYPE_EMPTY.
- *
- * ASN1_IDENTIFIER_NOT_FOUND: In the file there is an identifier that
- * is not defined (see @errorDescription for more information).
- *
- * ASN1_ARRAY_ERROR: The array pointed by @array is wrong.
- **/
+ * asn1_array2tree:
+ * @array: specify the array that contains ASN.1 declarations
+ * @definitions: return the pointer to the structure created by
+ * *ARRAY ASN.1 declarations
+ * @errorDescription: return the error description.
+ *
+ * Creates the structures needed to manage the ASN.1 definitions.
+ * @array is a vector created by asn1_parser2array().
+ *
+ * Returns:
+ *
+ * %ASN1_SUCCESS: Structure created correctly.
+ *
+ * %ASN1_ELEMENT_NOT_EMPTY: address@hidden not ASN1_TYPE_EMPTY.
+ *
+ * %ASN1_IDENTIFIER_NOT_FOUND: In the file there is an identifier that
+ * is not defined (see @errorDescription for more information).
+ *
+ * %ASN1_ARRAY_ERROR: The array pointed by @array is wrong.
+ **/
asn1_retCode
asn1_array2tree (const ASN1_ARRAY_TYPE * array, ASN1_TYPE * definitions,
char *errorDescription)
@@ -278,19 +278,18 @@ asn1_array2tree (const ASN1_ARRAY_TYPE * array, ASN1_TYPE
* definitions,
}
/**
- * asn1_delete_structure - Deletes the structure pointed by *ROOT.
- * @structure: pointer to the structure that you want to delete.
- *
- * Deletes the structure address@hidden At the end, address@hidden is set
- * to ASN1_TYPE_EMPTY.
- *
- * Returns:
- *
- * ASN1_SUCCESS: Everything OK.
- *
- * ASN1_ELEMENT_NOT_FOUND: address@hidden was ASN1_TYPE_EMPTY.
- *
- **/
+ * asn1_delete_structure:
+ * @structure: pointer to the structure that you want to delete.
+ *
+ * Deletes the structure address@hidden At the end, address@hidden is set
+ * to ASN1_TYPE_EMPTY.
+ *
+ * Returns:
+ *
+ * %ASN1_SUCCESS: Everything OK.
+ *
+ * %ASN1_ELEMENT_NOT_FOUND: address@hidden was ASN1_TYPE_EMPTY.
+ **/
asn1_retCode
asn1_delete_structure (ASN1_TYPE * structure)
{
@@ -345,20 +344,19 @@ asn1_delete_structure (ASN1_TYPE * structure)
/**
- * asn1_delete_element - Deletes the element of a structure.
- * @structure: pointer to the structure that contains the element you
- * want to delete.
- * @element_name: element's name you want to delete.
- *
- * Deletes the element named address@hidden inside address@hidden
- *
- * Returns:
- *
- * ASN1_SUCCESS: Everything OK.
- *
- * ASN1_ELEMENT_NOT_FOUND: The name element was not found.
- *
- **/
+ * asn1_delete_element:
+ * @structure: pointer to the structure that contains the element you
+ * want to delete.
+ * @element_name: element's name you want to delete.
+ *
+ * Deletes the element named address@hidden inside address@hidden
+ *
+ * Returns:
+ *
+ * %ASN1_SUCCESS: Everything OK.
+ *
+ * %ASN1_ELEMENT_NOT_FOUND: The name element was not found.
+ **/
asn1_retCode
asn1_delete_element (ASN1_TYPE structure, const char *element_name)
{
@@ -661,24 +659,23 @@ _asn1_expand_identifier (ASN1_TYPE * node, ASN1_TYPE root)
/**
- * asn1_create_element - Creates a structure of type SOURCE_NAME.
- * @definitions: pointer to the structure returned by "parser_asn1" function
- * @source_name: the name of the type of the new structure (must be
- * inside p_structure).
- * @element: pointer to the structure created.
- *
- * Creates a structure of type @source_name. Example using
- * "pkix.asn":
- *
- * rc = asn1_create_element(cert_def, "PKIX1.Certificate",
- * certptr);
- *
- * Returns:
- *
- * ASN1_SUCCESS: Creation OK.
- *
- * ASN1_ELEMENT_NOT_FOUND: SOURCE_NAME isn't known
- **/
+ * asn1_create_element:
+ * @definitions: pointer to the structure returned by "parser_asn1" function
+ * @source_name: the name of the type of the new structure (must be
+ * inside p_structure).
+ * @element: pointer to the structure created.
+ *
+ * Creates a structure of type @source_name. Example using
+ * "pkix.asn":
+ *
+ * rc = asn1_create_element(cert_def, "PKIX1.Certificate", certptr);
+ *
+ * Returns:
+ *
+ * %ASN1_SUCCESS: Creation OK.
+ *
+ * %ASN1_ELEMENT_NOT_FOUND: SOURCE_NAME isn't known
+ **/
asn1_retCode
asn1_create_element (ASN1_TYPE definitions, const char *source_name,
ASN1_TYPE * element)
@@ -703,17 +700,17 @@ asn1_create_element (ASN1_TYPE definitions, const char
*source_name,
/**
- * asn1_print_structure - Prints on the standard output the structure's tree
- * @out: pointer to the output file (e.g. stdout).
- * @structure: pointer to the structure that you want to visit.
- * @name: an element of the structure
- * @mode: specify how much of the structure to print, can be
- * %ASN1_PRINT_NAME, %ASN1_PRINT_NAME_TYPE,
- * %ASN1_PRINT_NAME_TYPE_VALUE, or %ASN1_PRINT_ALL.
- *
- * Prints on the @out file descriptor the structure's tree starting
- * from the @name element inside the structure @structure.
- **/
+ * asn1_print_structure:
+ * @out: pointer to the output file (e.g. stdout).
+ * @structure: pointer to the structure that you want to visit.
+ * @name: an element of the structure
+ * @mode: specify how much of the structure to print, can be
+ * %ASN1_PRINT_NAME, %ASN1_PRINT_NAME_TYPE,
+ * %ASN1_PRINT_NAME_TYPE_VALUE, or %ASN1_PRINT_ALL.
+ *
+ * Prints on the @out file descriptor the structure's tree starting
+ * from the @name element inside the structure @structure.
+ **/
void
asn1_print_structure (FILE * out, ASN1_TYPE structure, const char *name,
int mode)
@@ -1067,23 +1064,22 @@ asn1_print_structure (FILE * out, ASN1_TYPE structure,
const char *name,
/**
- * asn1_number_of_elements - Counts the number of elements of a structure.
- * @element: pointer to the root of an ASN1 structure.
- * @name: the name of a sub-structure of ROOT.
- * @num: pointer to an integer where the result will be stored
- *
- * Counts the number of elements of a sub-structure called NAME with
- * names equal to "?1","?2", ...
- *
- * Returns:
- *
- * ASN1_SUCCESS: Creation OK.
- *
- * ASN1_ELEMENT_NOT_FOUND: NAME isn't known.
- *
- * ASN1_GENERIC_ERROR: Pointer num equal to NULL.
- *
- **/
+ * asn1_number_of_elements:
+ * @element: pointer to the root of an ASN1 structure.
+ * @name: the name of a sub-structure of ROOT.
+ * @num: pointer to an integer where the result will be stored
+ *
+ * Counts the number of elements of a sub-structure called NAME with
+ * names equal to "?1","?2", ...
+ *
+ * Returns:
+ *
+ * %ASN1_SUCCESS: Creation OK.
+ *
+ * %ASN1_ELEMENT_NOT_FOUND: NAME isn't known.
+ *
+ * %ASN1_GENERIC_ERROR: Pointer num equal to NULL.
+ **/
asn1_retCode
asn1_number_of_elements (ASN1_TYPE element, const char *name, int *num)
{
@@ -1112,17 +1108,16 @@ asn1_number_of_elements (ASN1_TYPE element, const char
*name, int *num)
/**
- * asn1_find_structure_from_oid - Locate structure defined by a specific OID.
- * @definitions: ASN1 definitions
- * @oidValue: value of the OID to search (e.g. "1.2.3.4").
- *
- * Search the structure that is defined just after an OID definition.
- *
- * Returns: NULL when OIDVALUE not found, otherwise the pointer to a
- * constant string that contains the element name defined just
- * after the OID.
- *
- **/
+ * asn1_find_structure_from_oid:
+ * @definitions: ASN1 definitions
+ * @oidValue: value of the OID to search (e.g. "1.2.3.4").
+ *
+ * Search the structure that is defined just after an OID definition.
+ *
+ * Returns: %NULL when @oidValue not found, otherwise the pointer to a
+ * constant string that contains the element name defined just after
+ * the OID.
+ **/
const char *
asn1_find_structure_from_oid (ASN1_TYPE definitions, const char *oidValue)
{
@@ -1176,7 +1171,7 @@ asn1_find_structure_from_oid (ASN1_TYPE definitions,
const char *oidValue)
*
* Create a deep copy of a ASN1_TYPE variable.
*
- * Return value: Return ASN1_SUCCESS on success.
+ * Return value: Return %ASN1_SUCCESS on success.
**/
asn1_retCode
asn1_copy_node (ASN1_TYPE dst, const char *dst_name,
hooks/post-receive
--
GNU libtasn1
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Libtasn1-commit] [SCM] GNU libtasn1 branch, master, updated. libtasn1_2_4-8-g630956b,
Simon Josefsson <=