*** empty log message ***

7 files changed, 71 insertions, 65 deletions

diff --git a/NEWS b/NEWS
index 1d16664c4b..1149b4cca0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Version 0.9.99
+- Some fixes in the gnutls.h header for the gnutls_server_name_set()
+  and gnutls_server_name_get() prototypes.
+
 Version 0.9.98 (16/11/2003)
 - The openssl compatibility layer was moved to gnutls-openssl
   library instead of being included in the gnutls-extra library.
diff --git a/lib/ext_server_name.c b/lib/ext_server_name.c
index 508d0e870e..6f41afba74 100644
--- a/lib/ext_server_name.c
+++ b/lib/ext_server_name.c
@@ -213,7 +213,7 @@ int _gnutls_server_name_send_params(gnutls_session session, opaque * data,
   **/
 int gnutls_server_name_get(gnutls_session session, void *data,
 			   size_t *data_length,
-			   gnutls_server_name_type * type, 
+			   unsigned int * type, 
 			   unsigned int indx)
 {
    char *_data = data;
diff --git a/lib/gnutls.h.in.in b/lib/gnutls.h.in.in
index 3185df2f64..5c53a61575 100644
--- a/lib/gnutls.h.in.in
+++ b/lib/gnutls.h.in.in
@@ -255,7 +255,7 @@ int gnutls_server_name_set(gnutls_session session,
 
 int gnutls_server_name_get(gnutls_session session, 
 	void *data, size_t *data_length,
-	gnutls_server_name_type * type, int unsigned indx);
+	unsigned int * type, int unsigned indx);
 
 /* functions to set priority of cipher suites 
  */
diff --git a/opencdk.m4 b/opencdk.m4
index 6b5a6679a4..82609cc950 100644
--- a/opencdk.m4
+++ b/opencdk.m4
@@ -22,7 +22,6 @@ AC_ARG_ENABLE(libopencdktest,
           , enable_libopencdktest=yes)
 
   if test x$libopencdk_config_prefix != x ; then
-     libopencdk_config_args="$libopencdk_config_args --prefix=$libopencdk_config_prefix"
      if test x${LIBOPENCDK_CONFIG+set} != xset ; then
         LIBOPENCDK_CONFIG=$libopencdk_config_prefix/bin/opencdk-config
      fi
diff --git a/src/certtool-gaa.c b/src/certtool-gaa.c
index 2e50436aec..707ee10ed0 100644
--- a/src/certtool-gaa.c
+++ b/src/certtool-gaa.c
@@ -11,6 +11,9 @@
 # include <io.h>
 #endif
 
+void print_license(void);
+void certtool_version(void);
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -170,35 +173,35 @@ typedef struct _gaainfo gaainfo;
 
 struct _gaainfo
 {
-#line 78 "certtool.gaa"
+#line 81 "certtool.gaa"
 	int debug;
-#line 75 "certtool.gaa"
+#line 78 "certtool.gaa"
 	char *infile;
-#line 72 "certtool.gaa"
+#line 75 "certtool.gaa"
 	char *outfile;
-#line 69 "certtool.gaa"
+#line 72 "certtool.gaa"
 	int bits;
-#line 66 "certtool.gaa"
+#line 69 "certtool.gaa"
 	int outcert_format;
-#line 63 "certtool.gaa"
+#line 66 "certtool.gaa"
 	int incert_format;
-#line 60 "certtool.gaa"
+#line 63 "certtool.gaa"
 	int export;
-#line 57 "certtool.gaa"
+#line 60 "certtool.gaa"
 	int pkcs8;
-#line 44 "certtool.gaa"
+#line 47 "certtool.gaa"
 	char *pass;
-#line 41 "certtool.gaa"
+#line 44 "certtool.gaa"
 	char *ca;
-#line 38 "certtool.gaa"
+#line 41 "certtool.gaa"
 	char *ca_privkey;
-#line 35 "certtool.gaa"
+#line 38 "certtool.gaa"
 	char *cert;
-#line 32 "certtool.gaa"
+#line 35 "certtool.gaa"
 	char *request;
-#line 29 "certtool.gaa"
+#line 32 "certtool.gaa"
 	char *privkey;
-#line 14 "certtool.gaa"
+#line 17 "certtool.gaa"
 	int action;
 
 #line 114 "gaa.skel"
@@ -667,21 +670,21 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
     {
 	case GAAOPTID_copyright:
 	OK = 0;
-#line 84 "certtool.gaa"
+#line 87 "certtool.gaa"
 { print_license(); exit(0); ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_version:
 	OK = 0;
-#line 83 "certtool.gaa"
+#line 86 "certtool.gaa"
 { certtool_version(); exit(0); ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_help:
 	OK = 0;
-#line 81 "certtool.gaa"
+#line 84 "certtool.gaa"
 { gaa_help(); exit(0); ;};
 
 		return GAA_OK;
@@ -691,7 +694,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 		GAA_TESTMOREARGS;
 		GAA_FILL(GAATMP_debug.arg1, gaa_getint, GAATMP_debug.size1);
 		gaa_index++;
-#line 79 "certtool.gaa"
+#line 82 "certtool.gaa"
 { gaaval->debug = GAATMP_debug.arg1 ;};
 
 		return GAA_OK;
@@ -701,7 +704,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 		GAA_TESTMOREARGS;
 		GAA_FILL(GAATMP_infile.arg1, gaa_getstr, GAATMP_infile.size1);
 		gaa_index++;
-#line 76 "certtool.gaa"
+#line 79 "certtool.gaa"
 { gaaval->infile = GAATMP_infile.arg1 ;};
 
 		return GAA_OK;
@@ -711,7 +714,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 		GAA_TESTMOREARGS;
 		GAA_FILL(GAATMP_outfile.arg1, gaa_getstr, GAATMP_outfile.size1);
 		gaa_index++;
-#line 73 "certtool.gaa"
+#line 76 "certtool.gaa"
 { gaaval->outfile = GAATMP_outfile.arg1 ;};
 
 		return GAA_OK;
@@ -721,70 +724,70 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 		GAA_TESTMOREARGS;
 		GAA_FILL(GAATMP_bits.arg1, gaa_getint, GAATMP_bits.size1);
 		gaa_index++;
-#line 70 "certtool.gaa"
+#line 73 "certtool.gaa"
 { gaaval->bits = GAATMP_bits.arg1 ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_outder:
 	OK = 0;
-#line 67 "certtool.gaa"
+#line 70 "certtool.gaa"
 { gaaval->outcert_format=1 ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_inder:
 	OK = 0;
-#line 64 "certtool.gaa"
+#line 67 "certtool.gaa"
 { gaaval->incert_format=1 ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_export_ciphers:
 	OK = 0;
-#line 61 "certtool.gaa"
+#line 64 "certtool.gaa"
 { gaaval->export=1 ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_pkcs8:
 	OK = 0;
-#line 58 "certtool.gaa"
+#line 61 "certtool.gaa"
 { gaaval->pkcs8=1 ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_to_p12:
 	OK = 0;
-#line 55 "certtool.gaa"
+#line 58 "certtool.gaa"
 { gaaval->action = 8; ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_key_info:
 	OK = 0;
-#line 53 "certtool.gaa"
+#line 56 "certtool.gaa"
 { gaaval->action = 6; ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_p12_info:
 	OK = 0;
-#line 51 "certtool.gaa"
+#line 54 "certtool.gaa"
 { gaaval->action = 9; ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_crl_info:
 	OK = 0;
-#line 49 "certtool.gaa"
+#line 52 "certtool.gaa"
 { gaaval->action = 11; ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_certificate_info:
 	OK = 0;
-#line 47 "certtool.gaa"
+#line 50 "certtool.gaa"
 { gaaval->action = 2; ;};
 
 		return GAA_OK;
@@ -794,7 +797,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 		GAA_TESTMOREARGS;
 		GAA_FILL(GAATMP_password.arg1, gaa_getstr, GAATMP_password.size1);
 		gaa_index++;
-#line 45 "certtool.gaa"
+#line 48 "certtool.gaa"
 { gaaval->pass = GAATMP_password.arg1 ;};
 
 		return GAA_OK;
@@ -804,7 +807,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 		GAA_TESTMOREARGS;
 		GAA_FILL(GAATMP_load_ca_certificate.arg1, gaa_getstr, GAATMP_load_ca_certificate.size1);
 		gaa_index++;
-#line 42 "certtool.gaa"
+#line 45 "certtool.gaa"
 { gaaval->ca = GAATMP_load_ca_certificate.arg1 ;};
 
 		return GAA_OK;
@@ -814,7 +817,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 		GAA_TESTMOREARGS;
 		GAA_FILL(GAATMP_load_ca_privkey.arg1, gaa_getstr, GAATMP_load_ca_privkey.size1);
 		gaa_index++;
-#line 39 "certtool.gaa"
+#line 42 "certtool.gaa"
 { gaaval->ca_privkey = GAATMP_load_ca_privkey.arg1 ;};
 
 		return GAA_OK;
@@ -824,7 +827,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 		GAA_TESTMOREARGS;
 		GAA_FILL(GAATMP_load_certificate.arg1, gaa_getstr, GAATMP_load_certificate.size1);
 		gaa_index++;
-#line 36 "certtool.gaa"
+#line 39 "certtool.gaa"
 { gaaval->cert = GAATMP_load_certificate.arg1 ;};
 
 		return GAA_OK;
@@ -834,7 +837,7 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 		GAA_TESTMOREARGS;
 		GAA_FILL(GAATMP_load_request.arg1, gaa_getstr, GAATMP_load_request.size1);
 		gaa_index++;
-#line 33 "certtool.gaa"
+#line 36 "certtool.gaa"
 { gaaval->request = GAATMP_load_request.arg1 ;};
 
 		return GAA_OK;
@@ -844,56 +847,56 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 		GAA_TESTMOREARGS;
 		GAA_FILL(GAATMP_load_privkey.arg1, gaa_getstr, GAATMP_load_privkey.size1);
 		gaa_index++;
-#line 30 "certtool.gaa"
+#line 33 "certtool.gaa"
 { gaaval->privkey = GAATMP_load_privkey.arg1 ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_generate_dh_params:
 	OK = 0;
-#line 27 "certtool.gaa"
+#line 30 "certtool.gaa"
 { gaaval->action=10; ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_verify_chain:
 	OK = 0;
-#line 25 "certtool.gaa"
+#line 28 "certtool.gaa"
 { gaaval->action=5; ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_generate_request:
 	OK = 0;
-#line 23 "certtool.gaa"
+#line 26 "certtool.gaa"
 { gaaval->action=3; ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_generate_privkey:
 	OK = 0;
-#line 21 "certtool.gaa"
+#line 24 "certtool.gaa"
 { gaaval->action=1; ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_update_certificate:
 	OK = 0;
-#line 19 "certtool.gaa"
+#line 22 "certtool.gaa"
 { gaaval->action=7; ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_generate_certificate:
 	OK = 0;
-#line 17 "certtool.gaa"
+#line 20 "certtool.gaa"
 { gaaval->action=4; ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_generate_self_signed:
 	OK = 0;
-#line 15 "certtool.gaa"
+#line 18 "certtool.gaa"
 { gaaval->action=0; ;};
 
 		return GAA_OK;
@@ -922,7 +925,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
     if(inited == 0)
     {
 
-#line 86 "certtool.gaa"
+#line 89 "certtool.gaa"
 { gaaval->bits = 1024; gaaval->pkcs8 = 0; gaaval->privkey = NULL; gaaval->ca=NULL; gaaval->ca_privkey = NULL; 
 	gaaval->debug=1; gaaval->request = NULL; gaaval->infile = NULL; gaaval->outfile = NULL; gaaval->cert = NULL; 
 	gaaval->incert_format = 0; gaaval->outcert_format = 0; gaaval->action=-1; gaaval->pass = NULL; 
diff --git a/src/certtool-gaa.h b/src/certtool-gaa.h
index 806464988d..15210d0aac 100644
--- a/src/certtool-gaa.h
+++ b/src/certtool-gaa.h
@@ -8,35 +8,35 @@ typedef struct _gaainfo gaainfo;
 
 struct _gaainfo
 {
-#line 78 "certtool.gaa"
+#line 81 "certtool.gaa"
 	int debug;
-#line 75 "certtool.gaa"
+#line 78 "certtool.gaa"
 	char *infile;
-#line 72 "certtool.gaa"
+#line 75 "certtool.gaa"
 	char *outfile;
-#line 69 "certtool.gaa"
+#line 72 "certtool.gaa"
 	int bits;
-#line 66 "certtool.gaa"
+#line 69 "certtool.gaa"
 	int outcert_format;
-#line 63 "certtool.gaa"
+#line 66 "certtool.gaa"
 	int incert_format;
-#line 60 "certtool.gaa"
+#line 63 "certtool.gaa"
 	int export;
-#line 57 "certtool.gaa"
+#line 60 "certtool.gaa"
 	int pkcs8;
-#line 44 "certtool.gaa"
+#line 47 "certtool.gaa"
 	char *pass;
-#line 41 "certtool.gaa"
+#line 44 "certtool.gaa"
 	char *ca;
-#line 38 "certtool.gaa"
+#line 41 "certtool.gaa"
 	char *ca_privkey;
-#line 35 "certtool.gaa"
+#line 38 "certtool.gaa"
 	char *cert;
-#line 32 "certtool.gaa"
+#line 35 "certtool.gaa"
 	char *request;
-#line 29 "certtool.gaa"
+#line 32 "certtool.gaa"
 	char *privkey;
-#line 14 "certtool.gaa"
+#line 17 "certtool.gaa"
 	int action;
 
 #line 114 "gaa.skel"
diff --git a/src/certtool.c b/src/certtool.c
index 0cf3f237f7..296bbd50c3 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -810,8 +810,8 @@ void certificate_info( void)
 
 				print = printable;
 				for (j = 0; j < size; j++) {
-					sprintf(print, "%.2x ", (unsigned char) buffer[j]);
-					print += 3;
+					sprintf(print, "%.2x", (unsigned char) buffer[j]);
+					print += 2;
 				}
 				fprintf(outfile, "\t\tDER Data: %s\n", printable);