summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/coding.c4
-rw-r--r--lib/errors.c4
-rw-r--r--lib/libtasn1.h10
-rw-r--r--lib/libtasn1.map4
4 files changed, 7 insertions, 15 deletions
diff --git a/lib/coding.c b/lib/coding.c
index 5361b3f..b83b61a 100644
--- a/lib/coding.c
+++ b/lib/coding.c
@@ -61,13 +61,13 @@ _asn1_error_description_value_not_found (asn1_node node,
/**
* asn1_length_der:
* @len: value to convert.
- * @der: the encoding (may be %NULL).
+ * @der: buffer to hold the returned encoding (may be %NULL).
* @der_len: number of meaningful bytes of ANS (der[0]..der[der_len-1]).
*
* Creates the DER encoding of the provided length value.
* The @der buffer must have enough room for the output. The maximum
* length this function will encode is %ASN1_MAX_LENGTH_SIZE.
- *
+ *
* To know the size of the DER encoding use a %NULL value for @der.
**/
void
diff --git a/lib/errors.c b/lib/errors.c
index e01c3ee..0a14974 100644
--- a/lib/errors.c
+++ b/lib/errors.c
@@ -63,8 +63,6 @@ static const libtasn1_error_entry error_algorithms[] = {
* 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.
- *
* Since: 1.6
**/
void
@@ -82,8 +80,6 @@ asn1_perror (int error)
* 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.
- *
* Returns: Pointer to static zero-terminated string describing error
* code.
*
diff --git a/lib/libtasn1.h b/lib/libtasn1.h
index c296198..494a07d 100644
--- a/lib/libtasn1.h
+++ b/lib/libtasn1.h
@@ -192,13 +192,13 @@ extern "C"
/***********************************/
extern ASN1_API int
- asn1_parser2tree (const char *file_name,
- asn1_node * definitions, char *errorDescription);
+ asn1_parser2tree (const char *file,
+ asn1_node * definitions, char *error_desc);
extern ASN1_API int
asn1_parser2array (const char *inputFileName,
const char *outputFileName,
- const char *vectorName, char *errorDescription);
+ const char *vectorName, char *error_desc);
extern ASN1_API int
asn1_array2tree (const asn1_static_node * array,
@@ -288,11 +288,11 @@ extern "C"
asn1_get_length_ber (const unsigned char *ber, int ber_len, int *len);
extern ASN1_API void
- asn1_length_der (unsigned long int len, unsigned char *ans, int *ans_len);
+ asn1_length_der (unsigned long int len, unsigned char *der, int *der_len);
/* Other utility functions. */
- extern ASN1_API
+ extern ASN1_API
int asn1_decode_simple_der (unsigned int etype, const unsigned char *der, unsigned int der_len,
const unsigned char **str, unsigned int *str_len);
diff --git a/lib/libtasn1.map b/lib/libtasn1.map
index 439e4b0..2edf9ef 100644
--- a/lib/libtasn1.map
+++ b/lib/libtasn1.map
@@ -54,10 +54,6 @@ LIBTASN1_0_3
asn1_decode_simple_der;
asn1_read_value_type;
- # Old symbols
- libtasn1_strerror;
- libtasn1_perror;
-
local:
*;
};