From: Nikos Mavrogiannopoulos Date: Fri, 22 Nov 2013 15:33:22 +0000 (+0100) Subject: beautified table X-Git-Tag: gnutls_3_3_0pre0~520^2~43 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7eb898bc39947a97af85bc18c38d5d0921120451;p=thirdparty%2Fgnutls.git beautified table --- diff --git a/lib/x509/privkey_openssl.c b/lib/x509/privkey_openssl.c index 601e8f0c5b..03bbd64e96 100644 --- a/lib/x509/privkey_openssl.c +++ b/lib/x509/privkey_openssl.c @@ -85,19 +85,21 @@ openssl_hash_password(const char *pass, gnutls_datum_t * key, return 0; } -static const struct pem_cipher { +struct pem_cipher { const char *name; gnutls_cipher_algorithm_t cipher; -} pem_ciphers[] = { - { - "DES-CBC", GNUTLS_CIPHER_DES_CBC}, { - "DES-EDE3-CBC", GNUTLS_CIPHER_3DES_CBC}, { - "AES-128-CBC", GNUTLS_CIPHER_AES_128_CBC}, { - "AES-192-CBC", GNUTLS_CIPHER_AES_192_CBC}, { - "AES-256-CBC", GNUTLS_CIPHER_AES_256_CBC}, { - "CAMELLIA-128-CBC", GNUTLS_CIPHER_CAMELLIA_128_CBC}, { - "CAMELLIA-192-CBC", GNUTLS_CIPHER_CAMELLIA_192_CBC}, { -"CAMELLIA-256-CBC", GNUTLS_CIPHER_CAMELLIA_256_CBC},}; +}; + +static const struct pem_cipher pem_ciphers[] = { + {"DES-CBC", GNUTLS_CIPHER_DES_CBC}, + {"DES-EDE3-CBC", GNUTLS_CIPHER_3DES_CBC}, + {"AES-128-CBC", GNUTLS_CIPHER_AES_128_CBC}, + {"AES-192-CBC", GNUTLS_CIPHER_AES_192_CBC}, + {"AES-256-CBC", GNUTLS_CIPHER_AES_256_CBC}, + {"CAMELLIA-128-CBC", GNUTLS_CIPHER_CAMELLIA_128_CBC}, + {"CAMELLIA-192-CBC", GNUTLS_CIPHER_CAMELLIA_192_CBC}, + {"CAMELLIA-256-CBC", GNUTLS_CIPHER_CAMELLIA_256_CBC}, +}; /** * gnutls_x509_privkey_import_openssl: