added KX_PRIORITY option test

added CIPHER_ALGORITHM option test

src/daemon/https/openpgp/gnutls_openpgp.c

@@ -9,12 +9,12 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *               
+ *
  * GNUTLS-EXTRA is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *                               
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -38,8 +38,6 @@
 
 #define datum_append(x, y, z) _gnutls_datum_append_m (x, y, z, gnutls_realloc)
 
-
-
 static void
 release_mpi_array (mpi_t * arr, size_t n)
 {
@@ -256,7 +254,6 @@ leave:
   return rc;
 }
 
-
 /*-
  * _gnutls_openpgp_raw_key_to_gcert - Converts raw OpenPGP data to GnuTLS certs
  * @cert: the certificate to store the data.
@@ -306,7 +303,7 @@ _gnutls_openpgp_raw_key_to_gcert (gnutls_cert * cert,
   * @key: contains an openpgp public key
   * @pkey: is an openpgp private key
   *
-  * This function sets a certificate/private key pair in the 
+  * This function sets a certificate/private key pair in the
   * gnutls_certificate_credentials_t structure. This function may be called
   * more than once (in case multiple keys/certificates exist for the
   * server).
@@ -486,7 +483,7 @@ stream_to_datum (cdk_stream_t inp, gnutls_datum_t * raw)
  * @cert: the datum that contains the public key.
  * @key: the datum that contains the secret key.
  *
- * This funtion is used to load OpenPGP keys into the GnuTLS credential 
+ * This funtion is used to load OpenPGP keys into the GnuTLS credential
  * structure.
  * It doesn't matter whether the keys are armored or not, but the files
  * should only contain one key which should not be encrypted.
@@ -734,12 +731,8 @@ gnutls_certificate_set_openpgp_keyring_mem (gnutls_certificate_credentials_t
       gnutls_openpgp_keyring_deinit (c->keyring);
       return rc;
     }
-
-  return 0;
 #else
-
   c->keyring_format = format;
-
   c->keyring.data = gnutls_malloc (dlen + 1);
   if (c->keyring.data == NULL)
     {
@@ -749,8 +742,8 @@ gnutls_certificate_set_openpgp_keyring_mem (gnutls_certificate_credentials_t
   memcpy (c->keyring.data, data, dlen);
   c->keyring.data[dlen] = 0;
   c->keyring.size = dlen;
-
 #endif
+  return 0;
 }
 
 /*-

src/daemon/https/tls/gnutls_int.h

@@ -99,7 +99,7 @@
 
 #define HASH2MAC(x) ((gnutls_mac_algorithm_t)x)
 
-// TODO rm
+/* TODO rm */
 /* Additional cast to bring void* to a type castable to int. */
 #define GNUTLS_POINTER_TO_INT_CAST (long)
 

src/daemon/https/tls/gnutls_state.c

@@ -233,7 +233,7 @@ _gnutls_handshake_internal_state_clear (gnutls_session_t session)
  * Returns: %GNUTLS_E_SUCCESS on success, or an error code.
  **/
 
-// TODO rm redundent pointer ref  
+/* TODO rm redundent pointer ref */
 int
 gnutls_init (gnutls_session_t * session, gnutls_connection_end_t con_end)
 {
@@ -290,7 +290,7 @@ gnutls_init (gnutls_session_t * session, gnutls_connection_end_t con_end)
   gnutls_handshake_set_max_packet_length ((*session),
                                           MAX_HANDSHAKE_PACKET_SIZE);
 
-  /* Allocate a minimum size for recv_data 
+  /* Allocate a minimum size for recv_data
    * This is allocated in order to avoid small messages, making
    * the receive procedure slow.
    */
@@ -796,7 +796,7 @@ _gnutls_xor (opaque * o1, opaque * o2, int length)
 
 #define MAX_PRF_BYTES 200
 
-/* The PRF function expands a given secret 
+/* The PRF function expands a given secret
  * needed by the TLS specification. ret must have a least total_bytes
  * available.
  */

src/daemon/https/tls/pkix_asn1_tab.c

@@ -4,7 +4,7 @@
 
 #include <libtasn1.h>
 
-extern const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
+const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   {"PKIX1", 536875024, 0},
   {0, 1073741836, 0},
   {"id-ce", 1879048204, 0},