*** empty log message ***

diff --git a/doc/TODO b/doc/TODO
index 64b80f4ca424c028c036cdd2b79ba000e4610d87..7618206cda5efeab972830276760d3786e07a5c9 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,8 +1,8 @@
+* Add Client Certificate support in X509 authentication
+* Add certificate extensions support (x509v3)
+* Add DHE_* ciphersuites
+* Tools for processing/generating certificates
+* Documentation (of existing functions + Manual)
 * OpenPGP certificate support (through libgcrypt)
 * Add Kerberos support (who wants that?)
 * Audit the code (volunteers?)
-* Tools for processing/generating certificates
-* Add certificate extensions support (x509v3)
-* Documentation (of existing functions + Manual)
-* Add DHE_* ciphersuites
-* Add Client Certificate support in X509 authentication

diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index 91eafc9db4c01670bb9f0c5304a8d71f66c82600..f300e37c9c68946b6f5a4c2fcbcb45a97e8f93be 100644 (file)
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -457,10 +457,10 @@ static int _read_rsa_params(opaque * der, int dersize, MPI ** params)
 
 /* res is not malloced 
  */
-#define _READ( str, OID, NAME, res) \
+#define _READ( str, OID, ANAME, NAME, res) \
        if(strcmp(str, OID)==0){ \
-         strcpy( str, "PKIX1Implicit88.X520"); \
-         strcat( str, NAME); \
+         strcpy( str, "PKIX1Implicit88."); \
+         strcat( str, ANAME); \
          strcpy( name2, "temp-structure-"); \
          strcat( name2, NAME); \
          if ( (result = asn1_create_structure( _gnutls_get_pkix(), str, &tmpasn, name2)) != ASN_OK) { \
@@ -508,7 +508,6 @@ void _gnutls_int2str(int k, char* data) {
  * ASN.1 structure. (Taken from Fabio's samples!)
  * --nmav
  */
-#warning "Fix COUNTRY/EMAIL"
 static int _get_Name_type( node_asn *rasn, char *root, gnutls_DN * dn)
 {
        int k, k2, result, len;
@@ -562,21 +561,21 @@ static int _get_Name_type( node_asn *rasn, char *root, gnutls_DN * dn)
 
                        if (result == ASN_OK) {
                                node_asn *tmpasn;
-
-                               _READ(str, "2 5 4 6", "countryName",
-                                     dn->country);
-                               _READ(str, "2 5 4 10", "OrganizationName",
-                                     dn->organization);
-                               _READ(str, "2 5 4 11",
-                                     "OrganizationalUnitName",
-                                     dn->organizational_unit_name);
-                               _READ(str, "2 5 4 3", "CommonName",
-                                     dn->common_name);
-                               _READ(str, "2 5 4 7", "LocalityName",
-                                     dn->locality_name);
-                               _READ(str, "2 5 4 8",
-                                     "StateOrProvinceName",
-                                     dn->state_or_province_name);
+#ifdef DEBUG
+# warning " FIX COUNTRY HERE"
+#endif
+                               _READ(str, "2 5 4 6", "X520OrganizationName",
+                                       "countryName", dn->country);
+                               _READ(str, "2 5 4 10", "X520OrganizationName",
+                                       "OrganizationName", dn->organization);
+                               _READ(str, "2 5 4 11", "X520OrganizationalUnitName",
+                                     "OrganizationalUnitName", dn->organizational_unit_name);
+                               _READ(str, "2 5 4 3", "X520CommonName", 
+                                       "CommonName", dn->common_name);
+                               _READ(str, "2 5 4 7", "X520LocalityName",
+                                       "LocalityName", dn->locality_name);
+                               _READ(str, "2 5 4 8", "X520StateOrProvinceName",
+                                     "StateOrProvinceName", dn->state_or_province_name);
                        }
                } while (1);
        } while (1);

diff --git a/src/serv.c b/src/serv.c
index b5e9769ab939d3e973271dc5f3a62604742665b6..4fd23dc1dd4313d3299c739c74cb173d02315f55 100644 (file)
--- a/src/serv.c
+++ b/src/serv.c
@@ -93,7 +93,7 @@ GNUTLS_STATE initialize_state()
         * purposes.
         */
        gnutls_set_cipher_priority(state, GNUTLS_NULL_CIPHER, 
-                                  GNUTLS_RIJNDAEL_CBC, GNUTLS_3DES_CBC, 0);
+                                  GNUTLS_RIJNDAEL_CBC, GNUTLS_3DES_CBC, GNUTLS_ARCFOUR, 0);
        gnutls_set_compression_priority(state, GNUTLS_ZLIB, GNUTLS_NULL_COMPRESSION, 0);
        gnutls_set_kx_priority(state, GNUTLS_KX_DHE_RSA, GNUTLS_KX_RSA, GNUTLS_KX_SRP,
                               GNUTLS_KX_DH_ANON, 0);