File xephem-4.0.2_openssl_v2.patch of Package xephem

Overview Repositories Revisions Requests Users Attributes Meta

File xephem-4.0.2_openssl_v2.patch of Package xephem (Revision cb0a491f0b316275b53f997351570b14)

Currently displaying revision cb0a491f0b316275b53f997351570b14 , Show latest

diff -urNE xephem-4.0.2.orig/GUI/xephem/auxil/mpcorb2edb.pl xephem-4.0.2/GUI/xephem/auxil/mpcorb2edb.pl
--- xephem-4.0.2.orig/GUI/xephem/auxil/mpcorb2edb.pl	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/auxil/mpcorb2edb.pl	2021-09-06 13:44:59.635324154 +0200
@@ -78,7 +78,7 @@
 # setup cutoff mag
 my $dimmag = 13;			# dimmest mag to be saved in "bright" file
 # set site and file in case of -f
-my $MPCSITE = "http://www.minorplanetcenter.net";
+my $MPCSITE = "https://www.minorplanetcenter.net";
 my $MPCFTPDIR = "/iau/MPCORB";
 my $MPCFILE = "MPCORB.DAT";
 my $MPCZIPFILE = "MPCORB.DAT.gz";
diff -urNE xephem-4.0.2.orig/GUI/xephem/fallbacks.c xephem-4.0.2/GUI/xephem/fallbacks.c
--- xephem-4.0.2.orig/GUI/xephem/fallbacks.c	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/fallbacks.c	2021-09-06 13:45:38.032183145 +0200
@@ -747,10 +747,10 @@
     "XEphem*WebDB*URL1.value: http://celestrak.com/NORAD/elements/science.txt",
     "XEphem*WebDB*URL2.value: http://celestrak.com/NORAD/elements/tle-new.txt",
     "XEphem*WebDB*URL3.value: http://celestrak.com/NORAD/elements/amateur.txt",
-    "XEphem*WebDB*URL4.value: http://www.minorplanetcenter.org/iau/Ephemerides/Comets/Soft03Cmt.txt",
-    "XEphem*WebDB*URL5.value: http://www.minorplanetcenter.org/iau/Ephemerides/CritList/Soft03CritList.txt",
-    "XEphem*WebDB*URL6.value: http://www.minorplanetcenter.org/iau/Ephemerides/Distant/Soft03Distant.txt",
-    "XEphem*WebDB*URL7.value: http://www.minorplanetcenter.org/iau/Ephemerides/Unusual/Soft03Unusual.txt",
+    "XEphem*WebDB*URL4.value: https://www.minorplanetcenter.org/iau/Ephemerides/Comets/Soft03Cmt.txt",
+    "XEphem*WebDB*URL5.value: https://www.minorplanetcenter.org/iau/Ephemerides/CritList/Soft03CritList.txt",
+    "XEphem*WebDB*URL6.value: https://www.minorplanetcenter.org/iau/Ephemerides/Distant/Soft03Distant.txt",
+    "XEphem*WebDB*URL7.value: https://www.minorplanetcenter.org/iau/Ephemerides/Unusual/Soft03Unusual.txt",
     "XEphem*WebDB.x: 200",
     "XEphem*WebDB.y: 200",
     "XEphem*WeekStart.Monday.set: False",
diff -urNE xephem-4.0.2.orig/GUI/xephem/net.h xephem-4.0.2/GUI/xephem/net.h
--- xephem-4.0.2.orig/GUI/xephem/net.h	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/net.h	2021-09-06 13:46:56.297934044 +0200
@@ -20,6 +20,14 @@
 #include <sys/select.h>
 #endif
 
+#include <openssl/ssl.h>
+
+typedef struct {
+       int fd;         //file desciptor for the underlying connection socket
+       SSL *ssl;       //ssl connection for use with SSL_read( )and SSL_write()
+} XE_SSL_FD;
+
+
 /* support functions */
 
 extern int httpGET (char *host, char *GETcmd, char msg[]);
@@ -30,6 +38,13 @@
 extern int recvlineb (int sock, char *buf, int size);
 extern int sendbytes (int fd, unsigned char buf[], int n);
 
+extern int httpsGET (char *host, char *GETcmd, char msg[], XE_SSL_FD *ssl_fd);
+extern int ssl_recvbytes (XE_SSL_FD *ssl_fd, unsigned char buf[], int n);
+extern int ssl_readbytes (XE_SSL_FD *ssl_fd, unsigned char buf[], int n);
+extern int ssl_recvline (XE_SSL_FD *ssl_fd, char buf[], int max);
+extern int ssl_recvlineb (XE_SSL_FD *ssl_fd, char *buf, int size);
+
+
 
 
 #endif /* _NET_H */
diff -urNE xephem-4.0.2.orig/GUI/xephem/netmenu.c xephem-4.0.2/GUI/xephem/netmenu.c
--- xephem-4.0.2.orig/GUI/xephem/netmenu.c	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/netmenu.c	2021-09-06 13:53:38.998914902 +0200
@@ -9,6 +9,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <openssl/ssl.h>
+
 #include <Xm/Form.h>
 #include <Xm/Label.h>
 #include <Xm/PushB.h>
@@ -70,12 +72,25 @@
 
 static char netcategory[] = "Network";	/* Save category */
 
+static SSL_METHOD *ssl_method; /* global ssl dispatch structure for creating a ssl context */
+static SSL_CTX *ssl_ctx;       /* global ssl context structure for creating ssl connections */
+
+
 /* call to set up without actually bringing up the menus.
  */
 void
 net_create()
 {
 	if (!netshell_w) {
+           if (SSL_library_init() < 0) {
+               fprintf (stderr, "Could not initialize the OpenSSL library !\n");
+           } else {
+               ssl_method = SSLv23_client_method();    /* deprecated since openssl 1.1.x */
+//             ssl_method = TLS_client_method();       /* since openssl 1.1.x */
+               ssl_ctx = SSL_CTX_new (ssl_method);
+               SSL_CTX_set_options (ssl_ctx, SSL_OP_NO_SSLv2);
+           };
+
 	    net_create_form();
 	    (void) net_save();	/* confirming here is just annoying */
 	}
@@ -251,8 +266,8 @@
             struct {
 		unsigned char  VN;	/* version number */
 		unsigned char  CD;	/* command code */
-		unsigned short DSTPORT;	/* destination port */
-		unsigned long  DSTIP;	/* destination IP addres */
+		uint16_t DSTPORT;	/* destination port */
+		uint16_t  DSTIP;	/* destination IP addres */
 	    } SocksPacket;
 
 	    struct hostent *hs = gethostbyname (socks_host);
@@ -390,7 +405,7 @@
 
 /* read up to and including the next '\n' from socket fd into buf[max].
  * we silently ignore all '\r'. we add a trailing '\0'.
- * return line lenth (not counting \0) if all ok, else -1.
+ * return line length (not counting \0) if all ok, else -1.
  * N.B. this never reads ahead -- if that's ok, recvlineb() is better
  */
 int
@@ -445,27 +460,28 @@
 		if (nr <= 0) {
 		    ok = nr;
 		    rb_next = 0;
-		    rb_unk = 0;
-		    break;
-		}
-		rb_next = 0;
-		rb_unk = nr;
-	    }
-
-	    if ((c = rb_linebuf[rb_next++]) != '\r')
-		*buf++ = c;
-
-	} while (buf-origbuf < size && c != '\n');
+                   rb_unk = 0;
+                   break;
+               }
+               rb_next = 0;
+               rb_unk = nr;
+           }
+
+           if ((c = rb_linebuf[rb_next++]) != '\r')
+               *buf++ = c;
+
+       } while (buf-origbuf < size && c != '\n');
+
+       /* always give back a real line regardless, else status */
+       if (ok > 0) {
+           *buf = '\0';
+           ok = buf - origbuf;
+       }
 
-	/* always give back a real line regardless, else status */
-	if (ok > 0) {
-	    *buf = '\0';
-	    ok = buf - origbuf;
-	}
-
-	return (ok);
+       return (ok);
 }
 
+
 static void
 net_create_form()
 {
diff -urNE xephem-4.0.2.orig/GUI/xephem/sunmenu.c xephem-4.0.2/GUI/xephem/sunmenu.c
--- xephem-4.0.2.orig/GUI/xephem/sunmenu.c	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/sunmenu.c	2021-09-06 13:57:16.555763349 +0200
@@ -884,9 +884,12 @@
 	int isjpeg, jpegl;
 	int njpeg;
 	unsigned char *jpeg;
+       XE_SSL_FD ssl_fd;
+
 	int fd, nr;
 	struct tm tm;
 
+       memset(&ssl_fd, 0, sizeof(ssl_fd));
 	memset(&tm, 0, sizeof(struct tm));
 
 	/* get desired type and size */
@@ -901,7 +904,7 @@
 	sprintf (get, "GET http://%s%s HTTP/1.0\r\nUser-Agent: xephem/%s\r\n\r\n", sohohost, fn, PATCHLEVEL);
 
 	/* query server */
-	fd = httpGET (sohohost, get, buf);
+        fd = httpsGET (sohohost, get, buf, &ssl_fd);
 	if (fd < 0) {
 	    xe_msg (1, "http get: %s", buf);
 	    return (-1);
@@ -910,7 +913,7 @@
 	/* read header (everything to first blank line), looking for jpeg */
 	isjpeg = 0;
 	jpegl = 0;
-	while (recvline (fd, buf, sizeof(buf)) > 1) {
+	 while (ssl_recvline (&ssl_fd, buf, sizeof(buf)) > 1) {
 	    xe_msg (0, "Rcv: %s", buf);
 	    if (strstr (buf, "Content-Type:") && strstr (buf, "image/jpeg"))
 		isjpeg = 1;
@@ -923,15 +926,19 @@
 	    }
 	}
 	if (!isjpeg) {
-	    while (recvline (fd, buf, sizeof(buf)) > 0)
+	    while (ssl_recvline (&ssl_fd, buf, sizeof(buf)) > 0)
 		xe_msg (0, "Rcv: %s", buf);
 	    xe_msg (1, "Error talking to SOHO .. see File->System log\n");
-	    close (fd);
+            SSL_free (ssl_fd.ssl);
+            close (ssl_fd.fd);
+
 	    return (-1);
 	}
 	if (jpegl == 0) {
 	    xe_msg (1, "No Content-Length in header");
-	    close (fd);
+            SSL_free (ssl_fd.ssl);
+            close (ssl_fd.fd);
+
 	    return (-1);
 	}
 
@@ -941,18 +948,23 @@
 	for (njpeg = 0; njpeg < jpegl; njpeg += nr) {
 	    pm_set (100*njpeg/jpegl);
 	    jpeg = (unsigned char *) XtRealloc ((char*)jpeg, njpeg+NSREAD);
-	    nr = readbytes (fd, jpeg+njpeg, NSREAD);
-	    if (nr < 0) {
-		xe_msg (1, "%s:\n%s", sohohost, syserrstr());
+            nr = SSL_read (ssl_fd.ssl, jpeg+njpeg, NSREAD);
+            if (nr <= 0) {
+                xe_msg (1, "%s: ssl read error code: %d", sohohost, SSL_get_error(ssl_fd.ssl, nr));
+
 		pm_down();
-		close (fd);
+                SSL_free (ssl_fd.ssl);
+                close (ssl_fd.fd);
+
 		return (-1);
 	    }
 	    if (nr == 0)
 		break;
 	}
 	pm_down();
-	close (fd);
+        SSL_free (ssl_fd.ssl);
+        close (ssl_fd.fd);
+
 
         sprintf (fn, "/%s_%s.jpg", filetime, filetype);
 	/* display jpeg */
diff -urNE xephem-4.0.2.orig/GUI/xephem/ucac.c xephem-4.0.2/GUI/xephem/ucac.c
--- xephem-4.0.2.orig/GUI/xephem/ucac.c	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/ucac.c	2021-09-06 13:59:21.606554259 +0200
@@ -18,15 +18,17 @@
 
 #define	MAXFOV	15.0			/* max fov, degs */
 
-typedef unsigned char UC;		/* byte */
-typedef unsigned int UI;		/* unsigned integer */
+ typedef unsigned char XE_UC;           /* byte */
+ typedef unsigned int XE_UI;            /* unsigned integer */
+
 
 /* access an I*2 or I*4 at offset i in UC array a in little-endian byte order.
  * a bit slow but ultra portable.
  */
-#define	I2(a,i)		((int)(short)((((UI)(a)[i]) | (((UI)(a)[i+1])<<8))))
-#define	I4(a,i)		((int)((((UI)(a)[i]) | (((UI)(a)[i+1])<<8) | \
-				(((UI)(a)[i+2])<<16) | (((UI)(a)[i+3])<<24))))
+#define        I2(a,i)         ((int)(short)((((XE_UI)(a)[i]) | (((XE_UI)(a)[i+1])<<8))))
+#define        I4(a,i)         ((int)((((XE_UI)(a)[i]) | (((XE_UI)(a)[i+1])<<8) | \
+                               (((XE_UI)(a)[i+2])<<16) | (((XE_UI)(a)[i+3])<<24))))
+
 
 /* keep track of an array of ObjF */
 typedef struct {
@@ -48,9 +50,10 @@
 
 #define	DPMAS	(1.0/3600000.0)		/* degrees per milliarcsecond */
 
-typedef UC U2Star[44];			/* UCAC2 record */
-typedef UC U3Star[84];			/* UCAC3 record */
-typedef UC U4Star[78];			/* UCAC4 record */
+typedef XE_UC U2Star[44];              /* UCAC2 record */
+typedef XE_UC U3Star[84];              /* UCAC3 record */
+typedef XE_UC U4Star[78];              /* UCAC4 record */
+
 static char *basedir;			/* full dir with zone files and index */
 static FILE *indexfp;			/* index file handle */
 
@@ -293,7 +296,7 @@
 read4Index (int rz, int dz, int *nskip, int *nnew)
 {
 	off_t offset;
-	UC i4[4];
+       XE_UC i4[4];
 
 	offset = (rz*NZH4 + dz)*sizeof(i4);
 	if (fseek (indexfp, offset, SEEK_SET) < 0) {
@@ -508,7 +511,7 @@
 read3Index (int rz, int dz, int *nskip, int *nnew)
 {
 	off_t offset;
-	UC i4[4];
+        XE_UC i4[4];
 
 	offset = (rz*NZH + dz)*sizeof(i4);
 	if (fseek (indexfp, offset, SEEK_SET) < 0) {
diff -urNE xephem-4.0.2.orig/GUI/xephem/usno.c xephem-4.0.2/GUI/xephem/usno.c
--- xephem-4.0.2.orig/GUI/xephem/usno.c	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/usno.c	2021-09-06 14:01:13.961062736 +0200
@@ -14,8 +14,9 @@
 #define	CATBPR	12	/* bytes per star record in .cat file */
 #define	ACCBPR	30	/* bytes per record in .acc file */
 
-typedef unsigned int UI;
-typedef unsigned char UC;
+typedef unsigned int XE_UI;
+typedef unsigned char XE_UC;
+
 
 /* One Field star */
 typedef struct {
@@ -36,7 +37,7 @@
     double lr[2], int *nd, double fd[2], double ld[2], int zone[2], char msg[]);
 static int fetchSwath (int zone, double maxmag, double fr, double lr,
     double fd, double ld, StarArray *sap, char msg[]);
-static int crackCatBuf (UC buf[CATBPR], FieldStar *fsp);
+static int crackCatBuf (XE_UC buf[CATBPR], FieldStar *fsp);
 static int addGS (StarArray *sap, FieldStar *fsp);
 
 static char *cdpath;		/* where CD rom is mounted */
@@ -236,7 +237,7 @@
 {
 	char fn[1024];
 	char buf[ACCBPR];
-	UC catbuf[CATBPR];
+        XE_UC catbuf[CATBPR];
 	FieldStar fs;
 	long frec;
 	long os;
@@ -314,13 +315,14 @@
  * return 0 if ok, else -1.
  */
 static int
-crackCatBuf (UC buf[CATBPR], FieldStar *fsp)
+crackCatBuf (XE_UC buf[CATBPR], FieldStar *fsp)
 {
-#define	BEUPACK(b) (((UI)((b)[0])<<24) | ((UI)((b)[1])<<16) | ((UI)((b)[2])<<8)\
-							    | ((UI)((b)[3])))
+#define        BEUPACK(b) (((XE_UI)((b)[0])<<24) | ((XE_UI)((b)[1])<<16) | ((XE_UI)((b)[2])<<8)\
+                                                           | ((XE_UI)((b)[3])))
+
 	double ra, dec;
 	int red, blu;
-	UI mag;
+        XE_UI mag;
 
 	/* first 4 bytes are packed RA, big-endian */
 	ra = BEUPACK(buf)/(100.0*3600.0*15.0);
diff -urNE xephem-4.0.2.orig/GUI/xephem/webdbmenu.c xephem-4.0.2/GUI/xephem/webdbmenu.c
--- xephem-4.0.2.orig/GUI/xephem/webdbmenu.c	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/webdbmenu.c	2021-09-06 14:05:04.706221215 +0200
@@ -404,6 +404,11 @@
 char *url;
 {
 	static char http[] = "http://";
+        static char https[] = "https://";
+        char *transport = http;
+        int ltransport = strlen (transport);
+        int ishttp = 0;
+
 	char buf[512], msg[1024];
 	char l0[512], l1[512], l2[512];
 	char *l0p = l0, *l1p = l1, *l2p = l2;
@@ -411,21 +416,31 @@
 	char *slash, *dot;
 	char filename[256];
 	FILE *fp;
+        XE_SSL_FD ssl_fd;
 	int sockfd;
 	int nfound;
 
+        memset(&ssl_fd, 0, sizeof(ssl_fd));
 	/* start */
 	watch_cursor(1);
 	l0[0] = l1[0] = l2[0] = '\0';
 
 	/* find transport and host */
-	if (strncmp (url, http, 7)) {
-	    xe_msg (1, "URL must begin with %s", http);
+        if (!strncmp (url, transport, ltransport)) {
+            ishttp = 1;
+        } else {
+            transport = https;
+            ltransport = strlen (transport);
+        }
+ 
+        if ((!ishttp) && (strncmp (url, transport, ltransport))) {
+            xe_msg (1, "URL must begin with %s or %s", http, https);
+
 	    watch_cursor (0);
 	    return;
 	}
 
-	slash = strchr (url+7, '/');
+        slash = strchr (url+ltransport, '/');
 	dot = strrchr (url, '.');
 	if (!slash || !dot) {
 	    xe_msg (1, "Badly formed URL");
@@ -434,11 +449,17 @@
 	}
 
 	/* connect to check url */
-	sprintf (host, "%.*s", (int)(slash-url-7), url+7);
+        sprintf (host, "%.*s", (int)(slash-url-ltransport), url+ltransport);
 	sprintf (buf, "GET %s HTTP/1.1\r\nHost: %s\r\nConnection: close\r\nUser-Agent: xephem/%s\r\n\r\n",
 						url, host, PATCHLEVEL);
 	stopd_up();
+        if (ishttp) {
 	sockfd = httpGET (host, buf, msg);
+            ssl_fd.fd = sockfd;
+        } else {
+            sockfd = httpsGET (host, buf, msg, &ssl_fd);
+        }
+
 	if (sockfd < 0) {
 	    xe_msg (1, "http GET to %s failed: %s%s\n", host, buf, msg);
 	    stopd_down();
@@ -447,20 +468,23 @@
 	}
 
 	/* create local file */
-	slash = strrchr (url+7, '/');
+        slash = strrchr (url+ltransport, '/');
 	sprintf (filename, "%s/%.*sedb", getPrivateDir(), (int)(dot-slash), slash+1);
 	fp = fopen (filename, "w");
 	if (!fp) {
 	    xe_msg (1, "%s:\n%s", filename, syserrstr());
 	    watch_cursor (0);
-	    close (sockfd);
+            if (!ishttp)
+                SSL_free (ssl_fd.ssl);
+            close (ssl_fd.fd);
+
 	    return;
 	}
 
 	/* copy to file, insuring only .edb lines.
 	 */
 	nfound = 0;
-	while (recvlineb (sockfd, l2p, sizeof(l2)) > 0) {
+        while (ssl_recvlineb (&ssl_fd, l2p, sizeof(l2)) > 0) {
 	    char *lrot;
 	    Obj o;
 
@@ -484,7 +508,10 @@
 
 	/* tidy up and done */
 	fclose (fp);
-	close (sockfd);
+        if (!ishttp)
+            SSL_free (ssl_fd.ssl);
+        close (ssl_fd.fd);
+
 	if (!nfound) {
 	    xe_msg (1, "No objects in file");
 	    remove (filename);
diff -urNE xephem-4.0.2.orig/GUI/xephem/xephem.h xephem-4.0.2/GUI/xephem/xephem.h
--- xephem-4.0.2.orig/GUI/xephem/xephem.h	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/xephem.h	2021-09-06 14:05:32.178839911 +0200
@@ -12,12 +12,12 @@
 
 #include <stdarg.h>		/* be kind to those who don't use xe_msg() */
 
+#include "net.h" /* has to be included before astro.h because of openssl */
 #include "astro.h"
 #include "ip.h"
 
 /* local glue files */
 #include "map.h"
-#include "net.h"
 #include "patchlevel.h"
 #include "preferences.h"
 #include "db.h"

Places

File xephem-4.0.2_openssl_v2.patch of Package xephem (Revision cb0a491f0b316275b53f997351570b14)

Places