summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2003-11-11 16:23:56 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2003-11-11 16:23:56 +0000
commit898523d4c2632b7f6267c90a0b5c6a577876b75f (patch)
tree23cd3f075dc0f4f6075567583bd3ac1cbe4f6677 /includes
parente339849bb49ddd9ea0cd94c1a16396a3c450758b (diff)
downloadgnutls-898523d4c2632b7f6267c90a0b5c6a577876b75f.tar.gz
Renamed several pkcs #7 related functions. That is to allow future extensions to the API.
Diffstat (limited to 'includes')
-rw-r--r--includes/gnutls/x509.h25
1 files changed, 14 insertions, 11 deletions
diff --git a/includes/gnutls/x509.h b/includes/gnutls/x509.h
index 04865215f0..3b79682fcc 100644
--- a/includes/gnutls/x509.h
+++ b/includes/gnutls/x509.h
@@ -155,9 +155,11 @@ int gnutls_x509_crl_get_version(gnutls_x509_crl crl);
time_t gnutls_x509_crl_get_this_update(gnutls_x509_crl crl);
time_t gnutls_x509_crl_get_next_update(gnutls_x509_crl crl);
-int gnutls_x509_crl_get_certificate_count(gnutls_x509_crl crl);
-int gnutls_x509_crl_get_certificate(gnutls_x509_crl crl, int index, unsigned char* serial,
+int gnutls_x509_crl_get_crt_count(gnutls_x509_crl crl);
+int gnutls_x509_crl_get_crt_serial(gnutls_x509_crl crl, int index, unsigned char* serial,
size_t* serial_size, time_t* time);
+#define gnutls_x509_crl_get_crt_count gnutls_x509_crl_get_certificate_count
+#define gnutls_x509_crl_get_certificate gnutls_x509_crl_get_crt_serial
int gnutls_x509_crl_check_issuer( gnutls_x509_crl crl,
gnutls_x509_crt issuer);
@@ -171,25 +173,26 @@ typedef struct gnutls_pkcs7_int* gnutls_pkcs7;
int gnutls_pkcs7_init(gnutls_pkcs7 * pkcs7);
void gnutls_pkcs7_deinit(gnutls_pkcs7 pkcs7);
-int gnutls_pkcs7_get_certificate_count( gnutls_pkcs7 pkcs7);
int gnutls_pkcs7_import(gnutls_pkcs7 pkcs7, const gnutls_datum * data,
gnutls_x509_crt_fmt format);
int gnutls_pkcs7_export( gnutls_pkcs7 pkcs7,
gnutls_x509_crt_fmt format, unsigned char* output_data, size_t* output_data_size);
-int gnutls_pkcs7_get_certificate(gnutls_pkcs7 pkcs7, int indx,
+int gnutls_pkcs7_get_crt_count( gnutls_pkcs7 pkcs7);
+int gnutls_pkcs7_get_crt_raw(gnutls_pkcs7 pkcs7, int indx,
unsigned char* certificate, size_t* certificate_size);
-int gnutls_pkcs7_set_certificate(gnutls_pkcs7 pkcs7, const gnutls_datum* crt);
-int gnutls_pkcs7_set_certificate2(gnutls_pkcs7 pkcs7, gnutls_x509_crt crt);
-#define gnutls_pkcs7_set_crt gnutls_pkcs7_set_certificate2
-int gnutls_pkcs7_get_crl(gnutls_pkcs7 pkcs7,
+int gnutls_pkcs7_set_crt_raw(gnutls_pkcs7 pkcs7, const gnutls_datum* crt);
+int gnutls_pkcs7_set_crt(gnutls_pkcs7 pkcs7, gnutls_x509_crt crt);
+int gnutls_pkcs7_delete_crt(gnutls_pkcs7 pkcs7, int indx);
+
+int gnutls_pkcs7_get_crl_raw(gnutls_pkcs7 pkcs7,
int indx, unsigned char* crl, size_t* crl_size);
int gnutls_pkcs7_get_crl_count(gnutls_pkcs7 pkcs7);
-int gnutls_pkcs7_set_crl(gnutls_pkcs7 pkcs7, const gnutls_datum* crt);
-int gnutls_pkcs7_set_crl2(gnutls_pkcs7 pkcs7, gnutls_x509_crl crl);
-int gnutls_pkcs7_delete_crl(gnutls_pkcs7 pkcs7, int indx);
+int gnutls_pkcs7_set_crl_raw(gnutls_pkcs7 pkcs7, const gnutls_datum* crt);
+int gnutls_pkcs7_set_crl(gnutls_pkcs7 pkcs7, gnutls_x509_crl crl);
+int gnutls_pkcs7_delete_crl(gnutls_pkcs7 pkcs7, int indx);
/* X.509 Certificate verification functions.
*/