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 075cb320e42f8345be3077b32011a448)

Currently displaying revision 075cb320e42f8345be3077b32011a448 , Show latest

diff -burNE 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 -burNE xephem-4.0.2.orig/GUI/xephem/db.h xephem-4.0.2/GUI/xephem/db.h
--- xephem-4.0.2.orig/GUI/xephem/db.h	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/db.h	2021-09-06 15:27:13.340213411 +0200
@@ -1,5 +1,4 @@
-#ifndef _DB_H
-#define _DB_H
+#pragma once
 
 /* used to maintain progress state with db_scanint() and db_scan */
 typedef struct {
@@ -46,13 +45,12 @@
 
 extern char dbcategory[];
 
-extern DBCat *db_opfindcat (Obj *op);
-extern void db_newcatmenu (DBCat a[], int na);
-extern void db_catdel (DBCat *dbcp);
-extern void db_del_all (void);
-extern void db_rel_all (void);
-extern int db_dups (DupName **dnpp);
+DBCat *db_opfindcat (Obj *op);
+void db_newcatmenu (DBCat a[], int na);
+void db_catdel (DBCat *dbcp);
+void db_del_all (void);
+void db_rel_all (void);
+int db_n (void);
+int db_dups (DupName **dnpp);
 
-extern int db_chkAltNames(void);
-
-#endif /* _DB_H */
+int db_chkAltNames(void);
diff -burNE xephem-4.0.2.orig/GUI/xephem/dm.h xephem-4.0.2/GUI/xephem/dm.h
--- xephem-4.0.2.orig/GUI/xephem/dm.h	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/dm.h	2021-09-06 14:42:25.616304967 +0200
@@ -1,5 +1,4 @@
-#ifndef _DM_H
-#define _DM_H
+#pragma once
 
 /* used by funcs who want to print like datamenu */
 
@@ -25,6 +24,3 @@
 
 extern int dm_colHeader (DMCol c, char str[]);
 extern int dm_colFormat (Now *np, Obj *op, RiseSet *rp, DMCol c, char *str);
-
-
-#endif /* _DM_H */
diff -burNE 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 -burNE xephem-4.0.2.orig/GUI/xephem/indiapi.h xephem-4.0.2/GUI/xephem/indiapi.h
--- xephem-4.0.2.orig/GUI/xephem/indiapi.h	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/indiapi.h	2021-09-06 14:42:33.180473786 +0200
@@ -1,5 +1,4 @@
-#ifndef _INDIAPI_H
-#define _INDIAPI_H
+#pragma once
 
 #if 0
     INDI
@@ -208,4 +207,3 @@
 
 #define NARRAY(a)       (sizeof(a)/sizeof(a[0]))
 
-#endif /* _INDIAPI_H */
diff -burNE xephem-4.0.2.orig/GUI/xephem/map.h xephem-4.0.2/GUI/xephem/map.h
--- xephem-4.0.2.orig/GUI/xephem/map.h	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/map.h	2021-09-06 14:42:39.472614214 +0200
@@ -1,5 +1,4 @@
-#ifndef _MAP_H
-#define _MAP_H
+#pragma once
 
 /* these two structs are used to form lists of polygon vertices and lists
  *   of such lists. they are used to form maps.
@@ -14,5 +13,3 @@
     MCoord *mcp;	/* list of MCoords */
     int nmcp;		/* number of entries in mcp[] */
 } MRegion;
-
-#endif /* _MAP_H */
diff -burNE 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 14:45:50.120852261 +0200
@@ -1,5 +1,4 @@
-#ifndef _NET_H
-#define _NET_H
+#pragma once
 
 #ifdef VMS
 #include <types.h>
@@ -20,6 +19,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 +37,8 @@
 extern int recvlineb (int sock, char *buf, int size);
 extern int sendbytes (int fd, unsigned char buf[], int n);
 
-
-
-#endif /* _NET_H */
+int httpsGET (char *host, char *GETcmd, char msg[], XE_SSL_FD *ssl_fd);
+int ssl_recvbytes (XE_SSL_FD *ssl_fd, unsigned char buf[], int n);
+int ssl_readbytes (XE_SSL_FD *ssl_fd, unsigned char buf[], int n);
+int ssl_recvline (XE_SSL_FD *ssl_fd, char buf[], int max);
+int ssl_recvlineb (XE_SSL_FD *ssl_fd, char *buf, int size);
diff -burNE 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 15:14:43.203503001 +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
@@ -466,6 +481,218 @@
 	return (ok);
 }
 
+/* open the host, do the given GET cmd, and return a socket fd for the result.
+ * on success it fills the XE_SSL_FD structure for later use by SSL_read() and necessary cleanup.
+ * return -1 and with excuse in msg[], else 0 if ok.
+ * N.B. can be called before we are created if net set in app defaults.
+ */
+int
+httpsGET (char *host, char *GETcmd, char msg[], XE_SSL_FD *ssl_fd)
+{
+	char buf[2048];
+	int fd;
+	int connected;
+	SSL *ssl;
+	int n;
+	int ret;
+	int httpsport = 443;
+
+	/* open connection */
+	if (proxy_on) {
+	    fd = mkconnection (proxy_host, proxy_port, msg);
+	    if (fd < 0)
+		return (-1);
+
+	    /* fill buf with CONNECT */
+	    (void) sprintf (buf, "CONNECT %1$s:%2$d HTTP/1.0\r\nUser-Agent: xephem/%3$s\r\nHost: %1$s:%2$d\r\n\r\n", host, httpsport, PATCHLEVEL);
+
+	    /* add proxy auth if enabled */
+	    if (!auth_w)
+		net_create_form();
+	    if (XmToggleButtonGetState (auth_w))
+		addAuth(buf);
+
+	    /* log it */
+	    xe_msg (0, "https proxy connect: %s", buf);
+
+	    /* send it */
+	    n = strlen (buf);
+	    if (sendbytes(fd, (unsigned char *)buf, n) < 0) {
+		(void) sprintf (msg, "%s: send error: %s", proxy_host, syserrstr());
+		(void) close (fd);
+		return (-1);
+	    }
+
+	    connected = 0;
+	    while (recvline (fd, buf, sizeof(buf)) > 1) {
+		xe_msg (0, "Rcv: %s", buf);
+		if (strstr (buf, "200 "))
+		    connected = 1;
+	    }
+	    if (!connected) {
+		(void) sprintf (msg, "%s: connect error: %s", proxy_host, syserrstr());
+		(void) close (fd);
+		return (-1);
+	    }
+	} else {
+	    /* SOCKS or direct are both handled by mkconnection() */
+	    fd = mkconnection (host, httpsport, msg);
+	    if (fd < 0)
+		return (-1);
+	}
+
+	/* fill buf with GETcmd */
+	(void) sprintf (buf, "%s", GETcmd);
+
+	/* start ssl connection */
+	ssl = SSL_new (ssl_ctx);
+	SSL_set_fd (ssl, fd);
+	SSL_connect (ssl);
+
+	/* log it */
+	xe_msg (0, "https: %s", buf);
+
+	/* send it */
+	n = strlen (buf);
+	ret = SSL_write (ssl, (unsigned char *)buf, n);
+	if (ret <= 0) {
+	    (void) sprintf (msg, "%s: ssl send error code: %d", host, SSL_get_error (ssl, ret));
+	    (void) SSL_free (ssl);
+	    (void) close (fd);
+	    return (-1);
+	}
+
+	/* caller can read response */
+	ssl_fd->fd = fd;
+	ssl_fd->ssl = ssl;
+	return (fd);
+}
+
+/* receive exactly n bytes from ssl connection ssl_fd into buf.
+ * return -1, 0 or n.
+ * N.B. with fallback to ordinary read from socket if ssl_fd->ssl is NULL
+ */
+int
+ssl_recvbytes (XE_SSL_FD *ssl_fd, unsigned char buf[], int n)
+{
+	int ns, tot;
+
+	for (tot = 0; tot < n; tot += ns) {
+	    if (tout (TOUT, ssl_fd->fd, 0) < 0)
+		return (-1);
+	    if (ssl_fd->ssl)
+		ns = SSL_read (ssl_fd->ssl, (void *)(buf+tot), n-tot);
+	    else
+		ns = read (ssl_fd->fd, (void *)(buf+tot), n-tot);
+	    if (ns <= 0)
+		return (ns);
+	}
+	return (n);
+}
+
+/* like read(2) except we time out and allow user to cancel.
+ * receive up to n bytes from ssl connection ssl_fd into buf.
+ * return count, or 0 on eof or -1 on error.
+ * N.B. with fallback to ordinary read from socket if ssl_fd->ssl is NULL
+ */
+int
+ssl_readbytes (XE_SSL_FD *ssl_fd, unsigned char buf[], int n)
+{
+	int ns;
+
+	if (tout (TOUT, ssl_fd->fd, 0) < 0)
+	    return (-1);
+	if (ssl_fd->ssl)
+	    ns = SSL_read (ssl_fd->ssl, (void *)buf, n);
+	else
+	    ns = read (ssl_fd->fd, (void *)buf, n);
+	return (ns);
+}
+
+/* read up to and including the next '\n' from ssl into buf[max].
+ * we silently ignore all '\r'. we add a trailing '\0'.
+ * return line length (not counting \0) if all ok, else -1.
+ * N.B. with fallback to ordinary read from socket if ssl_fd->ssl is NULL
+ */
+int
+ssl_recvline (XE_SSL_FD *ssl_fd, char buf[], int max)
+{
+	unsigned char c;
+	int n;
+
+	max--;	/* leave room for trailing \0 */
+
+	for (n = 0; n < max && ssl_recvbytes (ssl_fd, &c, 1) == 1; ) {
+	    if (c != '\r') {
+		buf[n++] = c;
+		if (c == '\n') {
+		    buf[n] = '\0';
+		    return (n);
+		}
+	    }
+	}
+
+	return (-1);
+}
+
+/* rather like ssl_recvline but reads ahead in big chunk for efficiency.
+ * return length if read a line ok, 0 if hit eof, -1 if error.
+ * N.B. we silently swallow all '\r'.
+ * N.B. we read ahead and can hide bytes after each call.
+ * N.B. with fallback to ordinary read from socket if ssl_fd->ssl is NULL
+ */
+int
+ssl_recvlineb (XE_SSL_FD *ssl_fd, char *buf, int size)
+{
+	char *origbuf = buf;		/* save to prevent overfilling buf */
+	char c = '\0';
+	int ok = 1;
+
+	/* always leave room for trailing \n */
+	size -= 1;
+
+	/* read and copy linebuf[next] to buf until buf fills or copied a \n */
+	do {
+
+	    if (rb_next >= rb_unk) {
+		/* linebuf is empty -- refill */
+
+		int nr;
+
+		if (tout (TOUT, ssl_fd->fd, 0) < 0) {
+		    nr = -1;
+		    break;
+		}
+		if (ssl_fd->ssl)
+		    nr = SSL_read (ssl_fd->ssl, rb_linebuf, sizeof(rb_linebuf));
+		else
+		    nr = read (ssl_fd->fd, rb_linebuf, sizeof(rb_linebuf));
+		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');
+
+       /* always give back a real line regardless, else status */
+       if (ok > 0) {
+           *buf = '\0';
+           ok = buf - origbuf;
+       }
+
+       return (ok);
+}
+
+
 static void
 net_create_form()
 {
diff -burNE xephem-4.0.2.orig/GUI/xephem/patchlevel.h xephem-4.0.2/GUI/xephem/patchlevel.h
--- xephem-4.0.2.orig/GUI/xephem/patchlevel.h	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/patchlevel.h	2021-09-06 14:42:48.480815255 +0200
@@ -1,8 +1,5 @@
-#ifndef _PATCHLEVEL_H
-#define _PATCHLEVEL_H
+#pragma once
 
 extern char PATCHLEVEL[];
 extern char PATCHDATE[];
 extern char COPYRIGHT[];
-
-#endif /* _PATCHLEVEL_H */
diff -burNE xephem-4.0.2.orig/GUI/xephem/ps.h xephem-4.0.2/GUI/xephem/ps.h
--- xephem-4.0.2.orig/GUI/xephem/ps.h	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/ps.h	2021-09-06 14:43:00.129075226 +0200
@@ -1,5 +1,4 @@
-#ifndef _PS_H
-#define _PS_H
+#pragma once
 
 /* public include file for X postscript interface, ps.c.
  */
@@ -64,4 +63,3 @@
 				 */
 #define	AROWY(r)	(72 + (ANNOT_PTSZ+1)*(r))
 
-#endif /* _PS_H */
diff -burNE xephem-4.0.2.orig/GUI/xephem/rotated.h xephem-4.0.2/GUI/xephem/rotated.h
--- xephem-4.0.2.orig/GUI/xephem/rotated.h	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/rotated.h	2021-09-06 14:43:11.693333317 +0200
@@ -8,8 +8,7 @@
 
 /* ************************************************************************ */
 
-#ifndef _XVERTEXT_INCLUDED_ 
-#define _XVERTEXT_INCLUDED_
+#pragma once
 
 #define XV_VERSION      5.0
 #define XV_COPYRIGHT \
@@ -70,10 +69,3 @@
 #endif /* __cplusplus */
 
 /* ---------------------------------------------------------------------- */
-
-
-#endif /* _XVERTEXT_INCLUDED_ */
-
-
-
-
diff -burNE xephem-4.0.2.orig/GUI/xephem/sites.h xephem-4.0.2/GUI/xephem/sites.h
--- xephem-4.0.2.orig/GUI/xephem/sites.h	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/sites.h	2021-09-06 14:43:20.185522847 +0200
@@ -1,5 +1,4 @@
-#ifndef _SITES_H
-#define _SITES_H
+#pragma once
 
 /* interface to e_read_sites(). */
 
@@ -20,7 +19,3 @@
 extern int sites_search (char *str);
 extern void sites_manage (void);
 extern void sites_abbrev (char *full, char ab[], int maxn);
-
-
-
-#endif /* _SITES_H */
diff -burNE xephem-4.0.2.orig/GUI/xephem/skyeyep.h xephem-4.0.2/GUI/xephem/skyeyep.h
--- xephem-4.0.2.orig/GUI/xephem/skyeyep.h	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/skyeyep.h	2021-09-06 14:43:26.909672917 +0200
@@ -1,5 +1,4 @@
-#ifndef _SKYEPEP_H
-#define _SKYEPEP_H
+#pragma once
 
 /* include file to hook skyviewmenu.c and skyeyep.c together.
  */
@@ -22,6 +21,3 @@
 extern void se_manage(void);
 extern int se_isOneHere (int aamode, double azra, double altdec);
 extern void se_del (int aamode, double azra, double altdec);
-
-
-#endif /* _SKYEPEP_H */
diff -burNE xephem-4.0.2.orig/GUI/xephem/skyhist.h xephem-4.0.2/GUI/xephem/skyhist.h
--- xephem-4.0.2.orig/GUI/xephem/skyhist.h	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/skyhist.h	2021-09-06 14:43:33.325816038 +0200
@@ -1,5 +1,4 @@
-#ifndef _SKYHIST_H
-#define _SKYHIST_H
+#pragma once
 
 /* glue to hook skyviewmenu.c and skyhist.c together.
  */
@@ -51,5 +50,3 @@
 extern void svh_add_current(void);
 extern int svh_nhist(void);
 
-
-#endif /* _SKYHIST_H */
diff -burNE xephem-4.0.2.orig/GUI/xephem/skyip.h xephem-4.0.2/GUI/xephem/skyip.h
--- xephem-4.0.2.orig/GUI/xephem/skyip.h	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/skyip.h	2021-09-06 14:43:39.625955874 +0200
@@ -1,5 +1,4 @@
-#ifndef _SKYIP_H
-#define _SKYIP_H
+#pragma once
 
 /* zoom support */
 typedef struct {
@@ -50,4 +49,3 @@
 extern void siwcs_manage (void);
 extern void siwcs_unmanage (void);
 
-#endif /* _SKYIP_H */
diff -burNE xephem-4.0.2.orig/GUI/xephem/skylist.h xephem-4.0.2/GUI/xephem/skylist.h
--- xephem-4.0.2.orig/GUI/xephem/skylist.h	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/skylist.h	2021-09-06 14:43:45.734091449 +0200
@@ -1,5 +1,4 @@
-#ifndef _SKYLIST_H
-#define _SKYLIST_H
+#pragma once
 
 /* include file to hook skyviewmenu.c and skylist.c together.
  */
@@ -16,4 +15,3 @@
 extern void sl_manage(void);
 extern void sl_unmanage(void);
 
-#endif /* _SKYLIST_H */
diff -burNE xephem-4.0.2.orig/GUI/xephem/skytoolbar.h xephem-4.0.2/GUI/xephem/skytoolbar.h
--- xephem-4.0.2.orig/GUI/xephem/skytoolbar.h	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/skytoolbar.h	2021-09-06 14:43:52.162234125 +0200
@@ -1,5 +1,4 @@
-#ifndef _SKYTOOLBAR_H
-#define _SKYTOOLBAR_H
+#pragma once
 
 /* glue for skyview tool bar */
 
@@ -65,4 +64,3 @@
 extern void si_updateSlice (int on);
 extern void si_updateGlass (int on);
 
-#endif /* _SKYTOOLBAR_H */
diff -burNE 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 -burNE xephem-4.0.2.orig/GUI/xephem/tools/jost2edb.awk xephem-4.0.2/GUI/xephem/tools/jost2edb.awk
--- xephem-4.0.2.orig/GUI/xephem/tools/jost2edb.awk	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/tools/jost2edb.awk	2021-09-07 13:51:23.361502855 +0200
@@ -1,4 +1,4 @@
-#!/bin/awk -f
+#!/usr/bin/awk -f
 # convert from Jost Jahn postings format to {x}ephem format
 # we don't try to select out non-entries.
 # v2 11/24/94
diff -burNE xephem-4.0.2.orig/GUI/xephem/trails.h xephem-4.0.2/GUI/xephem/trails.h
--- xephem-4.0.2.orig/GUI/xephem/trails.h	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/trails.h	2021-09-06 14:43:58.794381331 +0200
@@ -1,5 +1,4 @@
-#ifndef _TRAILS_H
-#define _TRAILS_H
+#pragma once
 
 /* include file for users of the trail module.
  */
@@ -112,4 +111,3 @@
 extern void tr_setres (char *name, TrState *state);
 extern void tr_getres (char *name, TrState *state);
 
-#endif /* _TRAILS_H */
diff -burNE 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 14:18:05.843695106 +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) {
@@ -663,7 +666,7 @@
 get2N (int rz, int dz, int *idp)
 {
 	off_t offset;
-	UC nat[4];
+        XE_UC nat[4];
 
 	offset = (dz*NZW + rz)*sizeof(nat);
 	if (fseek (indexfp, offset, SEEK_SET) < 0)
diff -burNE 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 -burNE 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 -burNE xephem-4.0.2.orig/GUI/xephem/xephem.c xephem-4.0.2/GUI/xephem/xephem.c
--- xephem-4.0.2.orig/GUI/xephem/xephem.c	2021-08-23 19:26:14.000000000 +0200
+++ xephem-4.0.2/GUI/xephem/xephem.c	2021-09-06 15:29:41.899549734 +0200
@@ -7,6 +7,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/wait.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <unistd.h>
 
 #if defined(__NUTC__)
 #include <winnutc.h>
@@ -101,10 +104,10 @@
         OBJHLP, PREFHLP, OPERATION, CONTEXTHLP, SRCHHLP, DATETIME, NOTES
 } MBOptions;
 
-Widget toplevel_w;
+Widget toplevel_w = NULL;
 #define	XtD	XtDisplay(toplevel_w)
-Colormap xe_cm;
-XtAppContext xe_app;
+Colormap xe_cm =0;
+XtAppContext xe_app = NULL;
 char myclass[] = "XEphem";
 
 #define xephem_width 32
@@ -174,8 +177,13 @@
 	splashMsg ("Building shell\n");
 	n = 0;
 	XtSetArg (args[n], XmNallowShellResize, True); n++;
+#if 0
 	toplevel_w = XtAppInitialize (&xe_app, myclass, options,
 			    XtNumber(options), &argc, argv, NULL, args, n);
+#else
+	toplevel_w = XtOpenApplication (&xe_app, myclass, options,
+			    XtNumber(options), &argc, argv, NULL, sessionShellWidgetClass, args, n);
+#endif
 
 	/* add our resources from non-standard places */
 	splashMsg ("Reading X resources\n");
@@ -660,9 +668,9 @@
 	    {"Additional information about xephem and the Main display",
 		"Help", 0, 'H', "help_pd", help_buttons,XtNumber(help_buttons)};
 	    
-	Widget mainrc;
-	Widget mb_w;
-	Widget cb_w;
+	Widget mainrc=0;
+	Widget mb_w=0;
+	Widget cb_w=0;
 	Arg args[20];
 	int n;
 
diff -burNE 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 15:26:28.031198096 +0200
@@ -1,5 +1,4 @@
-#ifndef _XEPHEM_H
-#define	_XEPHEM_H
+#pragma once
 
 /* master include file for xephem.
  * first portion to be used by all, second assumes X already included.
@@ -12,12 +11,12 @@
 
 #include <stdarg.h>		/* be kind to those who don't use xe_msg() */
 
+#include "net.h"	/* needs to be placed before astro.h due to ssl */
 #include "astro.h"
 #include "ip.h"
 
 /* local glue files */
 #include "map.h"
-#include "net.h"
 #include "patchlevel.h"
 #include "preferences.h"
 #include "db.h"
@@ -74,7 +73,6 @@
 extern int confirm (void);
 extern int dateOK (Now *np, Obj *op);
 extern int db_load1 (void);
-extern int db_n (void);
 extern int db_set_field (char bp[], int id, PrefDateFormat pref, Obj *op);
 extern int execute_expr (double *vp, char *errbuf);
 extern int existsh (char *path);
@@ -453,6 +451,3 @@
 
 
 #endif
-
-#endif /* _XEPHEM_H */
-

Places

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

Places