summaryrefslogtreecommitdiff
path: root/lib/x509/virt-san.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/x509/virt-san.c')
-rw-r--r--lib/x509/virt-san.c164
1 files changed, 87 insertions, 77 deletions
diff --git a/lib/x509/virt-san.c b/lib/x509/virt-san.c
index e62bd4a038..71275dbca6 100644
--- a/lib/x509/virt-san.c
+++ b/lib/x509/virt-san.c
@@ -34,14 +34,17 @@ static
int san_othername_to_virtual(const char *oid, size_t size)
{
if (oid) {
- if ((unsigned) size == (sizeof(XMPP_OID)-1)
- && memcmp(oid, XMPP_OID, sizeof(XMPP_OID)-1) == 0)
+ if ((unsigned)size == (sizeof(XMPP_OID) - 1)
+ && memcmp(oid, XMPP_OID, sizeof(XMPP_OID) - 1) == 0)
return GNUTLS_SAN_OTHERNAME_XMPP;
- else if ((unsigned) size == (sizeof(KRB5_PRINCIPAL_OID)-1)
- && memcmp(oid, KRB5_PRINCIPAL_OID, sizeof(KRB5_PRINCIPAL_OID)-1) == 0)
+ else if ((unsigned)size == (sizeof(KRB5_PRINCIPAL_OID) - 1)
+ && memcmp(oid, KRB5_PRINCIPAL_OID,
+ sizeof(KRB5_PRINCIPAL_OID) - 1) == 0)
return GNUTLS_SAN_OTHERNAME_KRB5PRINCIPAL;
- else if ((unsigned) size == (sizeof(MSUSER_PRINCIPAL_NAME_OID)-1)
- && memcmp(oid, MSUSER_PRINCIPAL_NAME_OID, sizeof(MSUSER_PRINCIPAL_NAME_OID)-1) == 0)
+ else if ((unsigned)size ==
+ (sizeof(MSUSER_PRINCIPAL_NAME_OID) - 1)
+ && memcmp(oid, MSUSER_PRINCIPAL_NAME_OID,
+ sizeof(MSUSER_PRINCIPAL_NAME_OID) - 1) == 0)
return GNUTLS_SAN_OTHERNAME_MSUSERPRINCIPAL;
}
@@ -49,24 +52,26 @@ int san_othername_to_virtual(const char *oid, size_t size)
}
static
-const char * virtual_to_othername_oid(unsigned type)
+const char *virtual_to_othername_oid(unsigned type)
{
- switch(type) {
- case GNUTLS_SAN_OTHERNAME_XMPP:
- return XMPP_OID;
- case GNUTLS_SAN_OTHERNAME_KRB5PRINCIPAL:
- return KRB5_PRINCIPAL_OID;
- case GNUTLS_SAN_OTHERNAME_MSUSERPRINCIPAL:
- return MSUSER_PRINCIPAL_NAME_OID;
- default:
- return NULL;
+ switch (type) {
+ case GNUTLS_SAN_OTHERNAME_XMPP:
+ return XMPP_OID;
+ case GNUTLS_SAN_OTHERNAME_KRB5PRINCIPAL:
+ return KRB5_PRINCIPAL_OID;
+ case GNUTLS_SAN_OTHERNAME_MSUSERPRINCIPAL:
+ return MSUSER_PRINCIPAL_NAME_OID;
+ default:
+ return NULL;
}
}
-int _gnutls_alt_name_assign_virt_type(struct name_st *name, unsigned type, gnutls_datum_t *san, const char *othername_oid, unsigned raw)
+int _gnutls_alt_name_assign_virt_type(struct name_st *name, unsigned type,
+ gnutls_datum_t * san,
+ const char *othername_oid, unsigned raw)
{
- gnutls_datum_t encoded = {NULL, 0};
- gnutls_datum_t xmpp = {NULL,0};
+ gnutls_datum_t encoded = { NULL, 0 };
+ gnutls_datum_t xmpp = { NULL, 0 };
int ret;
if (type < 1000) {
@@ -83,45 +88,50 @@ int _gnutls_alt_name_assign_virt_type(struct name_st *name, unsigned type, gnutl
name->othername_oid.data = NULL;
name->othername_oid.size = 0;
}
- } else { /* virtual types */
+ } else { /* virtual types */
const char *oid = virtual_to_othername_oid(type);
if (oid == NULL)
return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
- switch(type) {
- case GNUTLS_SAN_OTHERNAME_XMPP:
+ switch (type) {
+ case GNUTLS_SAN_OTHERNAME_XMPP:
- ret = gnutls_idna_map((char*)san->data, san->size, &xmpp, 0);
- if (ret < 0)
- return gnutls_assert_val(ret);
+ ret =
+ gnutls_idna_map((char *)san->data, san->size, &xmpp,
+ 0);
+ if (ret < 0)
+ return gnutls_assert_val(ret);
- ret = _gnutls_x509_encode_string(ASN1_ETYPE_UTF8_STRING,
- xmpp.data, xmpp.size, &encoded);
+ ret = _gnutls_x509_encode_string(ASN1_ETYPE_UTF8_STRING,
+ xmpp.data, xmpp.size,
+ &encoded);
- gnutls_free(xmpp.data);
- if (ret < 0)
- return gnutls_assert_val(ret);
+ gnutls_free(xmpp.data);
+ if (ret < 0)
+ return gnutls_assert_val(ret);
- name->type = GNUTLS_SAN_OTHERNAME;
- name->san.data = encoded.data;
- name->san.size = encoded.size;
- name->othername_oid.data = (void*)gnutls_strdup(oid);
- name->othername_oid.size = strlen(oid);
- break;
+ name->type = GNUTLS_SAN_OTHERNAME;
+ name->san.data = encoded.data;
+ name->san.size = encoded.size;
+ name->othername_oid.data = (void *)gnutls_strdup(oid);
+ name->othername_oid.size = strlen(oid);
+ break;
- case GNUTLS_SAN_OTHERNAME_KRB5PRINCIPAL:
- ret = _gnutls_krb5_principal_to_der((char*)san->data, &name->san);
- if (ret < 0)
- return gnutls_assert_val(ret);
+ case GNUTLS_SAN_OTHERNAME_KRB5PRINCIPAL:
+ ret =
+ _gnutls_krb5_principal_to_der((char *)san->data,
+ &name->san);
+ if (ret < 0)
+ return gnutls_assert_val(ret);
- name->othername_oid.data = (void*)gnutls_strdup(oid);
- name->othername_oid.size = strlen(oid);
- name->type = GNUTLS_SAN_OTHERNAME;
- break;
+ name->othername_oid.data = (void *)gnutls_strdup(oid);
+ name->othername_oid.size = strlen(oid);
+ name->type = GNUTLS_SAN_OTHERNAME;
+ break;
- default:
- return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
+ default:
+ return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
}
gnutls_free(san->data);
@@ -144,10 +154,10 @@ int _gnutls_alt_name_assign_virt_type(struct name_st *name, unsigned type, gnutl
*
* Since: 3.3.8
**/
-int gnutls_x509_othername_to_virtual(const char *oid,
- const gnutls_datum_t *othername,
+int gnutls_x509_othername_to_virtual(const char *oid,
+ const gnutls_datum_t * othername,
unsigned int *virt_type,
- gnutls_datum_t *virt)
+ gnutls_datum_t * virt)
{
int ret;
unsigned type;
@@ -159,33 +169,33 @@ int gnutls_x509_othername_to_virtual(const char *oid,
if (virt_type)
*virt_type = type;
- switch(type) {
- case GNUTLS_SAN_OTHERNAME_XMPP:
- ret = _gnutls_x509_decode_string
- (ASN1_ETYPE_UTF8_STRING, othername->data,
- othername->size, virt, 0);
- if (ret < 0) {
- gnutls_assert();
- return ret;
- }
- return 0;
- case GNUTLS_SAN_OTHERNAME_KRB5PRINCIPAL:
- ret = _gnutls_krb5_der_to_principal(othername, virt);
- if (ret < 0) {
- gnutls_assert();
- return ret;
- }
- return 0;
- case GNUTLS_SAN_OTHERNAME_MSUSERPRINCIPAL:
- ret = _gnutls_x509_decode_string
- (ASN1_ETYPE_UTF8_STRING, othername->data,
- othername->size, virt, 0);
- if (ret < 0) {
- gnutls_assert();
- return ret;
- }
- return 0;
- default:
- return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
+ switch (type) {
+ case GNUTLS_SAN_OTHERNAME_XMPP:
+ ret = _gnutls_x509_decode_string
+ (ASN1_ETYPE_UTF8_STRING, othername->data,
+ othername->size, virt, 0);
+ if (ret < 0) {
+ gnutls_assert();
+ return ret;
+ }
+ return 0;
+ case GNUTLS_SAN_OTHERNAME_KRB5PRINCIPAL:
+ ret = _gnutls_krb5_der_to_principal(othername, virt);
+ if (ret < 0) {
+ gnutls_assert();
+ return ret;
+ }
+ return 0;
+ case GNUTLS_SAN_OTHERNAME_MSUSERPRINCIPAL:
+ ret = _gnutls_x509_decode_string
+ (ASN1_ETYPE_UTF8_STRING, othername->data,
+ othername->size, virt, 0);
+ if (ret < 0) {
+ gnutls_assert();
+ return ret;
+ }
+ return 0;
+ default:
+ return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
}
}
View Lorry Controller Status