diff options
Diffstat (limited to 'lib/pcert.c')
| -rw-r--r-- | lib/pcert.c | 125 |
1 files changed, 54 insertions, 71 deletions
diff --git a/lib/pcert.c b/lib/pcert.c index 84da6d2fd7..d50f664df6 100644 --- a/lib/pcert.c +++ b/lib/pcert.c @@ -44,8 +44,8 @@ * * Since: 3.0 **/ -int gnutls_pcert_import_x509(gnutls_pcert_st * pcert, - gnutls_x509_crt_t crt, unsigned int flags) +int gnutls_pcert_import_x509(gnutls_pcert_st *pcert, gnutls_x509_crt_t crt, + unsigned int flags) { int ret; @@ -76,7 +76,7 @@ int gnutls_pcert_import_x509(gnutls_pcert_st * pcert, return 0; - cleanup: +cleanup: _gnutls_free_datum(&pcert->cert); return ret; @@ -104,8 +104,8 @@ int gnutls_pcert_import_x509(gnutls_pcert_st * pcert, * * Since: 3.4.0 **/ -int gnutls_pcert_import_x509_list(gnutls_pcert_st * pcert_list, - gnutls_x509_crt_t * crt, unsigned *ncrt, +int gnutls_pcert_import_x509_list(gnutls_pcert_st *pcert_list, + gnutls_x509_crt_t *crt, unsigned *ncrt, unsigned int flags) { int ret; @@ -142,12 +142,11 @@ int gnutls_pcert_import_x509_list(gnutls_pcert_st * pcert_list, return 0; - cleanup: +cleanup: for (i = 0; i < current; i++) { gnutls_pcert_deinit(&pcert_list[i]); } return ret; - } /** @@ -172,12 +171,11 @@ int gnutls_pcert_import_x509_list(gnutls_pcert_st * pcert_list, * * Since: 3.0 **/ -int -gnutls_pcert_list_import_x509_raw(gnutls_pcert_st * pcert_list, - unsigned int *pcert_list_size, - const gnutls_datum_t * data, - gnutls_x509_crt_fmt_t format, - unsigned int flags) +int gnutls_pcert_list_import_x509_raw(gnutls_pcert_st *pcert_list, + unsigned int *pcert_list_size, + const gnutls_datum_t *data, + gnutls_x509_crt_fmt_t format, + unsigned int flags) { int ret; unsigned int i = 0, j; @@ -189,9 +187,8 @@ gnutls_pcert_list_import_x509_raw(gnutls_pcert_st * pcert_list, if (crt == NULL) return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR); - ret = - gnutls_x509_crt_list_import(crt, pcert_list_size, data, format, - flags); + ret = gnutls_x509_crt_list_import(crt, pcert_list_size, data, format, + flags); if (ret < 0) { ret = gnutls_assert_val(ret); goto cleanup_crt; @@ -208,18 +205,17 @@ gnutls_pcert_list_import_x509_raw(gnutls_pcert_st * pcert_list, ret = 0; goto cleanup; - cleanup_pcert: +cleanup_pcert: for (j = 0; j < i; j++) gnutls_pcert_deinit(&pcert_list[j]); - cleanup: +cleanup: for (i = 0; i < *pcert_list_size; i++) gnutls_x509_crt_deinit(crt[i]); - cleanup_crt: +cleanup_crt: gnutls_free(crt); return ret; - } /** @@ -244,13 +240,10 @@ gnutls_pcert_list_import_x509_raw(gnutls_pcert_st * pcert_list, * * Since: 3.6.3 **/ -int gnutls_pcert_list_import_x509_file(gnutls_pcert_st * pcert_list, - unsigned *pcert_list_size, - const char *file, - gnutls_x509_crt_fmt_t format, - gnutls_pin_callback_t pin_fn, - void *pin_fn_userdata, - unsigned int flags) +int gnutls_pcert_list_import_x509_file( + gnutls_pcert_st *pcert_list, unsigned *pcert_list_size, + const char *file, gnutls_x509_crt_fmt_t format, + gnutls_pin_callback_t pin_fn, void *pin_fn_userdata, unsigned int flags) { int ret, ret2; unsigned i; @@ -259,15 +252,12 @@ int gnutls_pcert_list_import_x509_file(gnutls_pcert_st * pcert_list, gnutls_datum_t data = { NULL, 0 }; if (gnutls_url_is_supported(file) != 0) { - ret = - gnutls_x509_crt_list_import_url(&crts, &crts_size, file, - pin_fn, pin_fn_userdata, 0); + ret = gnutls_x509_crt_list_import_url( + &crts, &crts_size, file, pin_fn, pin_fn_userdata, 0); if (ret < 0) { - ret2 = - gnutls_x509_crt_list_import_url(&crts, &crts_size, - file, pin_fn, - pin_fn_userdata, - GNUTLS_PKCS11_OBJ_FLAG_LOGIN); + ret2 = gnutls_x509_crt_list_import_url( + &crts, &crts_size, file, pin_fn, + pin_fn_userdata, GNUTLS_PKCS11_OBJ_FLAG_LOGIN); if (ret2 >= 0) ret = ret2; } @@ -277,16 +267,14 @@ int gnutls_pcert_list_import_x509_file(gnutls_pcert_st * pcert_list, goto cleanup; } - } else { /* file */ + } else { /* file */ ret = gnutls_load_file(file, &data); if (ret < 0) return gnutls_assert_val(ret); - ret = - gnutls_x509_crt_list_import2(&crts, &crts_size, &data, - format, - flags | - GNUTLS_X509_CRT_LIST_SORT); + ret = gnutls_x509_crt_list_import2( + &crts, &crts_size, &data, format, + flags | GNUTLS_X509_CRT_LIST_SORT); if (ret < 0) { gnutls_assert(); goto cleanup; @@ -299,8 +287,8 @@ int gnutls_pcert_list_import_x509_file(gnutls_pcert_st * pcert_list, goto cleanup; } - ret = - gnutls_pcert_import_x509_list(pcert_list, crts, &crts_size, flags); + ret = gnutls_pcert_import_x509_list(pcert_list, crts, &crts_size, + flags); if (ret < 0) { gnutls_assert(); goto cleanup; @@ -308,7 +296,7 @@ int gnutls_pcert_list_import_x509_file(gnutls_pcert_st * pcert_list, *pcert_list_size = crts_size; ret = 0; - cleanup: +cleanup: for (i = 0; i < crts_size; i++) gnutls_x509_crt_deinit(crts[i]); gnutls_free(crts); @@ -332,8 +320,8 @@ int gnutls_pcert_list_import_x509_file(gnutls_pcert_st * pcert_list, * * Since: 3.0 **/ -int gnutls_pcert_import_x509_raw(gnutls_pcert_st * pcert, - const gnutls_datum_t * cert, +int gnutls_pcert_import_x509_raw(gnutls_pcert_st *pcert, + const gnutls_datum_t *cert, gnutls_x509_crt_fmt_t format, unsigned int flags) { @@ -360,7 +348,7 @@ int gnutls_pcert_import_x509_raw(gnutls_pcert_st * pcert, ret = 0; - cleanup: +cleanup: gnutls_x509_crt_deinit(crt); return ret; @@ -383,8 +371,8 @@ int gnutls_pcert_import_x509_raw(gnutls_pcert_st * pcert, * * Since: 3.6.6 **/ -int gnutls_pcert_import_rawpk(gnutls_pcert_st * pcert, - gnutls_pubkey_t pubkey, unsigned int flags) +int gnutls_pcert_import_rawpk(gnutls_pcert_st *pcert, gnutls_pubkey_t pubkey, + unsigned int flags) { int ret; @@ -435,8 +423,8 @@ int gnutls_pcert_import_rawpk(gnutls_pcert_st * pcert, * * Since: 3.6.6 **/ -int gnutls_pcert_import_rawpk_raw(gnutls_pcert_st * pcert, - const gnutls_datum_t * rawpubkey, +int gnutls_pcert_import_rawpk_raw(gnutls_pcert_st *pcert, + const gnutls_datum_t *rawpubkey, gnutls_x509_crt_fmt_t format, unsigned int key_usage, unsigned int flags) { @@ -467,9 +455,8 @@ int gnutls_pcert_import_rawpk_raw(gnutls_pcert_st * pcert, * convert if necessary. */ if (format == GNUTLS_X509_FMT_PEM) { - ret = _gnutls_fbase64_decode(PEM_PK, - rawpubkey->data, rawpubkey->size, - &pcert->cert); + ret = _gnutls_fbase64_decode(PEM_PK, rawpubkey->data, + rawpubkey->size, &pcert->cert); if (ret < 0) { gnutls_pubkey_deinit(pcert->pubkey); @@ -478,9 +465,8 @@ int gnutls_pcert_import_rawpk_raw(gnutls_pcert_st * pcert, } } else { // Directly copy the raw DER data to our pcert - ret = - _gnutls_set_datum(&pcert->cert, rawpubkey->data, - rawpubkey->size); + ret = _gnutls_set_datum(&pcert->cert, rawpubkey->data, + rawpubkey->size); if (ret < 0) { gnutls_pubkey_deinit(pcert->pubkey); @@ -509,7 +495,7 @@ int gnutls_pcert_import_rawpk_raw(gnutls_pcert_st * pcert, * * Since: 3.4.0 */ -int gnutls_pcert_export_x509(gnutls_pcert_st * pcert, gnutls_x509_crt_t * crt) +int gnutls_pcert_export_x509(gnutls_pcert_st *pcert, gnutls_x509_crt_t *crt) { int ret; @@ -541,7 +527,7 @@ int gnutls_pcert_export_x509(gnutls_pcert_st * pcert, gnutls_x509_crt_t * crt) * * Since: 3.0 **/ -void gnutls_pcert_deinit(gnutls_pcert_st * pcert) +void gnutls_pcert_deinit(gnutls_pcert_st *pcert) { if (pcert->pubkey) gnutls_pubkey_deinit(pcert->pubkey); @@ -552,22 +538,19 @@ void gnutls_pcert_deinit(gnutls_pcert_st * pcert) /* Converts the first certificate for the cert_auth_info structure * to a pcert. */ -int -_gnutls_get_auth_info_pcert(gnutls_pcert_st * pcert, - gnutls_certificate_type_t type, - cert_auth_info_t info) +int _gnutls_get_auth_info_pcert(gnutls_pcert_st *pcert, + gnutls_certificate_type_t type, + cert_auth_info_t info) { switch (type) { case GNUTLS_CRT_X509: - return gnutls_pcert_import_x509_raw(pcert, - &info->raw_certificate_list - [0], GNUTLS_X509_FMT_DER, - 0); + return gnutls_pcert_import_x509_raw( + pcert, &info->raw_certificate_list[0], + GNUTLS_X509_FMT_DER, 0); case GNUTLS_CRT_RAWPK: - return gnutls_pcert_import_rawpk_raw(pcert, - &info->raw_certificate_list - [0], GNUTLS_X509_FMT_DER, - 0, 0); + return gnutls_pcert_import_rawpk_raw( + pcert, &info->raw_certificate_list[0], + GNUTLS_X509_FMT_DER, 0, 0); default: return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR); } |