From: Nikos Mavrogiannopoulos Date: Sun, 16 Nov 2003 10:11:11 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: gnutls_0_9_98~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66ee20b3129956526fa34b5cf394ec9f6abe3ca7;p=thirdparty%2Fgnutls.git *** empty log message *** --- diff --git a/includes/gnutls/x509.h b/includes/gnutls/x509.h index 66697e4db7..35dd87dce3 100644 --- a/includes/gnutls/x509.h +++ b/includes/gnutls/x509.h @@ -87,7 +87,7 @@ int gnutls_x509_crt_get_ca_status(gnutls_x509_crt cert, unsigned int* critical); int gnutls_x509_crt_get_key_usage( gnutls_x509_crt cert, unsigned int* key_usage, unsigned int* critical); -int gnutls_x509_oid_known(const char* oid); +int gnutls_x509_dn_oid_known(const char* oid); /* key_usage will be an OR of the following values: */ diff --git a/lib/x509/common.c b/lib/x509/common.c index ef592bf84d..f719670e77 100644 --- a/lib/x509/common.c +++ b/lib/x509/common.c @@ -78,10 +78,10 @@ int i = 0; } /** - * gnutls_x509_oid_known - This function will return true if the given OID is known + * gnutls_x509_dn_oid_known - This function will return true if the given OID is known * @oid: holds an Object Identifier in a null terminated string * - * This function will inform about known OIDs. This is useful since functions + * This function will inform about known DN OIDs. This is useful since functions * like gnutls_x509_crt_set_dn_by_oid() use the information on known * OIDs to properly encode their input. Object Identifiers that are not * known are not encoded by these functions, and their input is stored directly @@ -91,7 +91,7 @@ int i = 0; * Returns 1 on known OIDs and 0 otherwise. * **/ -int gnutls_x509_oid_known( const char* oid) +int gnutls_x509_dn_oid_known( const char* oid) { int i = 0; diff --git a/lib/x509/crl.c b/lib/x509/crl.c index dd8f10e671..a6d8df8ac1 100644 --- a/lib/x509/crl.c +++ b/lib/x509/crl.c @@ -192,6 +192,9 @@ int gnutls_x509_crl_get_issuer_dn(gnutls_x509_crl crl, char *buf, * by the given OID. The output will be encoded as described in RFC2253. * * Some helper macros with popular OIDs can be found in gnutls/x509.h + * If raw flag is zero, this function will only return known OIDs as text. Other OIDs + * will be DER encoded, as described in RFC2253 -- in hex format with a '#' prefix. + * You can check about known OIDs using gnutls_x509_dn_oid_known(). * * If buf is null then only the size will be filled. * diff --git a/lib/x509/crq.c b/lib/x509/crq.c index 1c8fb58c37..081bab1482 100644 --- a/lib/x509/crq.c +++ b/lib/x509/crq.c @@ -198,9 +198,9 @@ int gnutls_x509_crq_get_dn(gnutls_x509_crq crq, char *buf, * by the given OID. The output will be encoded as described in RFC2253. * * Some helper macros with popular OIDs can be found in gnutls/x509.h - * This function will only return known OIDs as text. For other OIDs the output + * If raw flag is zero, this function will only return known OIDs as text. Other OIDs * will be DER encoded, as described in RFC2253 -- in hex format with a '#' prefix. - * You can check about known OIDs using gnutls_x509_oid_known(). + * You can check about known OIDs using gnutls_x509_dn_oid_known(). * * If buf is null then only the size will be filled. * @@ -426,7 +426,7 @@ int gnutls_x509_crq_get_challenge_password(gnutls_x509_crq crq, * * Some helper macros with popular OIDs can be found in gnutls/x509.h * With this function you can only set the known OIDs. You can test - * for known OIDs using gnutls_x509_oid_known(). For OIDs that are + * for known OIDs using gnutls_x509_dn_oid_known(). For OIDs that are * not known (by gnutls) you should properly DER encode your data, and * call this function with raw_flag set. * diff --git a/lib/x509/x509.c b/lib/x509/x509.c index a125647c08..a5970da1b7 100644 --- a/lib/x509/x509.c +++ b/lib/x509/x509.c @@ -250,9 +250,9 @@ int gnutls_x509_crt_get_issuer_dn(gnutls_x509_crt cert, char *buf, * by the given OID. The output will be encoded as described in RFC2253. * * Some helper macros with popular OIDs can be found in gnutls/x509.h - * This function will only return known OIDs as text. For other OIDs the output + * If raw flag is zero, this function will only return known OIDs as text. Other OIDs * will be DER encoded, as described in RFC2253 -- in hex format with a '#' prefix. - * You can check about known OIDs using gnutls_x509_oid_known(). + * You can check about known OIDs using gnutls_x509_dn_oid_known(). * * If buf is null then only the size will be filled. * @@ -343,9 +343,9 @@ int gnutls_x509_crt_get_dn(gnutls_x509_crt cert, char *buf, * by the given OID. * * Some helper macros with popular OIDs can be found in gnutls/x509.h - * This function will only return known OIDs as text. For other OIDs the output + * If raw flag is zero, this function will only return known OIDs as text. Other OIDs * will be DER encoded, as described in RFC2253 -- in hex format with a '#' prefix. - * You can check about known OIDs using gnutls_x509_oid_known(). + * You can check about known OIDs using gnutls_x509_dn_oid_known(). * * If buf is null then only the size will be filled. * diff --git a/lib/x509/x509_write.c b/lib/x509/x509_write.c index 56f70680c8..33008ca330 100644 --- a/lib/x509/x509_write.c +++ b/lib/x509/x509_write.c @@ -55,7 +55,7 @@ static void disable_optional_stuff( gnutls_x509_crt cert); * * Some helper macros with popular OIDs can be found in gnutls/x509.h * With this function you can only set the known OIDs. You can test - * for known OIDs using gnutls_x509_oid_known(). For OIDs that are + * for known OIDs using gnutls_x509_dn_oid_known(). For OIDs that are * not known (by gnutls) you should properly DER encode your data, and * call this function with raw_flag set. * @@ -86,7 +86,7 @@ int gnutls_x509_crt_set_dn_by_oid(gnutls_x509_crt crt, const char* oid, * * Some helper macros with popular OIDs can be found in gnutls/x509.h * With this function you can only set the known OIDs. You can test - * for known OIDs using gnutls_x509_oid_known(). For OIDs that are + * for known OIDs using gnutls_x509_dn_oid_known(). For OIDs that are * not known (by gnutls) you should properly DER encode your data, and * call this function with raw_flag set. *