several fixes cleanups etc.

6 files changed, 25 insertions, 38 deletions

diff --git a/src/.cvsignore b/src/.cvsignore
index 5ec147f854..2e6fe98fc6 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -8,4 +8,5 @@ Makefile.in
 .deps
 .libs
 crypt
+asn1c
 CertificateExample
\ No newline at end of file
diff --git a/src/asn1c.c b/src/asn1c.c
index 547332a871..508d145c3d 100644
--- a/src/asn1c.c
+++ b/src/asn1c.c
@@ -34,14 +34,17 @@ int
 main(int argc,char *argv[])
 {
   int result;
-  FILE* tmp;
+  char* outfile;
   
-  if(argc!=3) {
+  if(argc<2||argc>3) {
   	fprintf(stderr, "Usage: %s: input.asn output.c\n", argv[0]);
   	exit(1);
   }
  
-  result=asn1_parser_asn1_file_c( argv[1], argv[2]);
+  if (argc==3) outfile=argv[2];
+  else outfile=NULL;
+  
+  result=asn1_parser_asn1_file_c( argv[1], outfile);
 
   if(result==ASN_SYNTAX_ERROR){
     printf("PARSE ERROR\n");
diff --git a/src/ca.pem b/src/ca.pem
deleted file mode 100644
index 8a77d91abb..0000000000
--- a/src/ca.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC2jCCAkOgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBmDELMAkGA1UEBhMCR1Ix
-DzANBgNVBAgTBkF0dGlraTEPMA0GA1UEBxMGQXRoaW5hMRcwFQYDVQQKEw5HTlVU
-TFMgVEVTVCBDQTEWMBQGA1UECxMNR05VVExTIERFVkVMLjEXMBUGA1UEAxMOR05V
-VExTIFRFU1QgQ0ExHTAbBgkqhkiG9w0BCQEWDm5tYXZAaGVsbHVnLmdyMB4XDTAx
-MDcyMDA3MTMyMFoXDTExMDcxODA3MTMyMFowgZgxCzAJBgNVBAYTAkdSMQ8wDQYD
-VQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGluYTEXMBUGA1UEChMOR05VVExTIFRF
-U1QgQ0ExFjAUBgNVBAsTDUdOVVRMUyBERVZFTC4xFzAVBgNVBAMTDkdOVVRMUyBU
-RVNUIENBMR0wGwYJKoZIhvcNAQkBFg5ubWF2QGhlbGx1Zy5ncjCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAu3HbtQcFB+lQ/2OPEd14LKLRh3OzTNWZsem2rj6x
-oHTuMaIWGuzgIrJAF92wfx5+qcNJ1ZttbfhHR84dbR8wISxeoTN8jA2vy6w6qsfk
-/kuiZQb7NZML1l2tW+PzESnSxBuJSywoM6nu3Q17UeoZ4l2qgdY90iDI0lxh/0JK
-Oi0CAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUhJDoDTbwcum9
-BaWIOdcRxlpWRbwwDQYJKoZIhvcNAQEEBQADgYEAcDd/j9F8F0AOPu1LnsS1DquV
-7LNRApEj5OTw6tR7Xih9S8eDY2wzMi9szEykEIQ0qxOamA6V443xq4qDoturX1mg
-E60rHVHNRmy9qcqvMKn7bt+11fgXE4Ya4do+hcBMwjuI4wmXDD160mFiiMHaVmUx
-fy3Pa7F8RfUIMieurAU=
------END CERTIFICATE-----
diff --git a/src/cli.c b/src/cli.c
index e57a541d8c..8a39929433 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -37,7 +37,7 @@
 #define RESUME
 
 #define MAX(X,Y) (X >= Y ? X : Y);
-#define CAFILE "ca.pem"
+#define CAFILE "x509/ca.pem"
 #define CRLFILE NULL
 
 #define PRINTX(x,y) if (y[0]!=0) printf(" -   %s %s\n", x, y)
@@ -202,7 +202,7 @@ int main(int argc, char** argv)
 	print_info( state);
 
 	printf("- Disconnecting\n");
-	gnutls_bye(sd, state);
+	gnutls_bye(sd, state, 0);
 	shutdown( sd, SHUT_WR);
 	close(sd);	
 	gnutls_deinit( state);	
@@ -312,7 +312,7 @@ int main(int argc, char** argv)
 		if (FD_ISSET(fileno(stdin), &rset)) {
 	
 			if( fgets(buffer, MAX_BUF, stdin) == NULL) {
-				gnutls_bye(sd, state);
+				gnutls_bye(sd, state, 0);
 				user_term = 1;
 				continue;
 			}
@@ -320,7 +320,7 @@ int main(int argc, char** argv)
 			printf("- Sent: %d bytes\n", strlen(buffer));
 		}
 	}
-	if (user_term!=0) gnutls_bye(sd, state);
+	if (user_term!=0) gnutls_bye(sd, state, 0);
 	
 	shutdown( sd, SHUT_RDWR); /* no more receptions */
 	close(sd);
diff --git a/src/pkcs1.asn b/src/pkcs1.asn
index c162b5fd46..d04dacabbc 100644
--- a/src/pkcs1.asn
+++ b/src/pkcs1.asn
@@ -1,10 +1,5 @@
 PKCS-1 {iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-1(1)  modules(0) pkcs-1(1)}
 
--- $Revision$
-
--- This module has been checked for conformance with the ASN.1 
--- standard by the OSS ASN.1 Tools
-
 DEFINITIONS EXPLICIT TAGS ::=
 
 BEGIN
@@ -45,11 +40,13 @@ OtherPrimeInfo ::= SEQUENCE {
 	coefficient INTEGER -- ti 
 }
 
--- for signature calculation -nmav
+-- for signature calculation
+-- added by nmav
 
-AlgorithmIdentifier  ::=  SEQUENCE  {
+AlgorithmIdentifier ::= SEQUENCE  {
      algorithm               OBJECT IDENTIFIER,
-     parameters              ANY DEFINED BY algorithm OPTIONAL  }
+     parameters              ANY DEFINED BY algorithm OPTIONAL  
+}
                                 -- contains a value of the type
                                 -- registered for use with the
                                 -- algorithm object identifier value
diff --git a/src/serv.c b/src/serv.c
index 772023725a..78a05a2428 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -302,17 +302,19 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	if (gnutls_set_x509_server_key( x509_cred, CERTFILE, KEYFILE) < 0) {
-		fprintf(stderr, "X509 PARSE ERROR\nDid you have key.pem and cert.pem?\n");
+	if (gnutls_set_x509_server_trust( x509_cred, CAFILE, CRLFILE) < 0) {
+		fprintf(stderr, "X509 PARSE ERROR\nDid you have ca.pem?\n");
 		exit(1);
 	}
 
-	if (gnutls_set_x509_server_trust( x509_cred, CAFILE, CRLFILE) < 0) {
-		fprintf(stderr, "X509 PARSE ERROR\nDid you have ca.pem?\n");
+	if (gnutls_set_x509_server_key( x509_cred, CERTFILE, KEYFILE) < 0) {
+		fprintf(stderr, "X509 PARSE ERROR\nDid you have key.pem and cert.pem?\n");
 		exit(1);
 	}
 
 
+
+
 	listen_sd = socket(AF_INET, SOCK_STREAM, 0);
 	ERR(listen_sd, "socket");
 
@@ -406,7 +408,9 @@ int main(int argc, char **argv)
 			}
 		}
 		printf("\n");
-		gnutls_bye_nowait(sd, state);
+		gnutls_bye(sd, state, 1); /* do not wait for
+		 * the peer to close the connection.
+		 */
 		close(sd);
 		gnutls_deinit(state);
 	}