+- Changed some stuff with SSL, you may want to seperate server.pem into

+  server.key.pem and server.cert.pem (or "rm Makefile" and "./Config")
+- Fixed a couple of SJOIN/Link problems detected by Curt|s

Changes

@@ -738,5 +738,8 @@
 - Fixed cutoff server infos in synch
 - Added so /gline and /shun accepts time periods in 1d2h3s etc. a recode of
   some potvin stuff
+- Added so blocking is only effective when SSL_connect()'ing
+- Fixed a couple of SJOIN/Link problems detected by Curt|s
+- Changed some stuff with SSL, you may want to seperate server.pem into
   server.key.pem and server.cert.pem (or "rm Makefile" and "./Config")
 - Fixed a couple of SJOIN/Link problems detected by Curt|s

Makefile.dist

@@ -214,7 +214,12 @@ install: all
 	@echo "Now install by hand; make install is broken."
 
 pem:	src/ssl.cnf
-	$(OPENSSLPATH) req -new -x509 -days 365 -nodes \
-                -config src/ssl.cnf -out server.pem -keyout server.pem
+	@echo "Generating certificate request .. "
+	$(OPENSSLPATH) req -new -config src/ssl.cnf -out server.req.pem \
+              -keyout server.key.pem -nodes
+	@echo "Generating self-signed certificate .. "
+	$(OPENSSLPATH) req -x509 -days 365 -in server.req.pem \
+               -key server.key.pem -out server.cert.pem
+	@echo "Generating fingerprint .."
 	$(OPENSSLPATH) x509 -subject -dates -fingerprint -noout \
-		-in server.pem
+		-in server.cert.pem

include/ssl.h

@@ -1,6 +1,6 @@
 /* Make these what you want for cert & key files */
-#define CERTF  "server.pem"
-#define KEYF  "server.pem"
+#define CERTF  "server.cert.pem"
+#define KEYF  "server.key.pem"
 
 
 extern   SSL_CTX * ctx;

src/ssl.c

@@ -54,7 +54,7 @@ void init_ctx_client(void)
 		ircd_log("Failed to load SSL certificate %s (client)", "client.pem");
 		exit(3);
 	}
-	if (SSL_CTX_use_PrivateKey_file(ctx_client, CERTF, SSL_FILETYPE_PEM) <= 0)
+	if (SSL_CTX_use_PrivateKey_file(ctx_client, KEYF, SSL_FILETYPE_PEM) <= 0)
 	{
 		ircd_log("Failed to load SSL private key %s (client)", KEYF);
 		exit(4);

src/ssl.cnf

@@ -9,25 +9,23 @@ distinguished_name = req_dn
 x509_extensions = cert_type
 
 [ req_dn ]
-countryName = US
-countryName_default             = Country Name
+countryName = Country Name
+countryName_default             = US
 countryName_min                 = 2
 countryName_max                 = 2
 
-stateOrProvinceName             = City
-stateOrProvinceName_default     = City
+stateOrProvinceName             = State/Province
+stateOrProvinceName_default     = New York
 
 localityName                    = Locality Name (eg, city)
 
 0.organizationName              = Organization Name (eg, company)
-0.organizationName_default      = Organization Name (eg. company)
+0.organizationName_default      = IRC geeks
 
 organizationalUnitName          = Organizational Unit Name (eg, section)
-#organizationalUnitName_default =
+organizationalUnitName_default  = IRCd  
 
 0.commonName                    = Common Name (Full domain of your server)
-
-1.commonName                    = Common Name (default)
 1.commonName_value              = localhost
 
 [ cert_type ]