--- pgp/src/makefile.unx	2018/04/24 16:39:07	1.1.1.3
+++ pgp/src/makefile.unx	2018/04/24 16:39:58	1.1.1.4
@@ -55,7 +55,7 @@ default:
 	@echo "        sysv_386, sco-2.0, x286(*), hpux, linux, mips-ultrix, vax-ultrix,"
 	@echo "        xenix386, mach_386, 386bsd, isc, isc_asm, 3b1, 3b1_asm, rs6000,"
 	@echo "        bsd, bsdgcc, vax_bsd43, rt_aos4, osf, sgigcc_asm, sgigcc, irix"
-	@echo "        newsgcc, newsasm, aux(*), os2, djgpp"
+	@echo "        newsgcc, newsasm, aux(*), aux-gcc, os2, djgpp"
 	@echo ""
 	@echo "for targets marked with (*) you must first get unproto, see"
 	@echo "setup.doc for further details"
@@ -63,19 +63,44 @@ default:
 
 all: $(PROJ)
 
+# RSAOBJS = rsa.o nn.o digit.o r_random.o r_stdlib.o
+
+rsaref: $(RSAOBJS)
+
+RSADIR = ../../rsaref/source/
+
+rsa.o: $(RSADIR)rsa.c global.h $(RSADIR)rsaref.h $(RSADIR)r_random.h \
+  $(RSADIR)md5.h
+	$(CC) -c -I$(RSADIR) -I. $(CFLAGS) -Dstatic= $(RSADIR)rsa.c
+
+nn.o : $(RSADIR)nn.c global.h $(RSADIR)rsaref.h \
+  $(RSADIR)nn.h $(RSADIR)digit.h
+	$(CC) -c -I$(RSADIR) -I. $(CFLAGS) $(RSADIR)nn.c
+
+digit.o : $(RSADIR)digit.c global.h $(RSADIR)rsaref.h $(RSADIR)nn.h \
+  $(RSADIR)digit.h
+	$(CC) -c -I$(RSADIR) -I. $(CFLAGS) $(RSADIR)digit.c
+
+r_random.o : $(RSADIR)r_random.c global.h $(RSADIR)rsaref.h  \
+  $(RSADIR)r_random.h $(RSADIR)md5.h
+	$(CC) -c -I$(RSADIR) -I. $(CFLAGS) $(RSADIR)r_random.c
+
+r_stdlib.o : $(RSADIR)r_stdlib.c global.h $(RSADIR)rsaref.h
+	$(CC) -c -I$(RSADIR) -I. $(CFLAGS) $(RSADIR)r_stdlib.c
+
 _80386.o:	80386.S
 	$(CPP) $(ASMDEF) 80386.S > _80386.s
-	$(ASM) _80386.s
+	$(ASM) -o $@ _80386.s
 	rm -f _80386.s
 
 8086.o: 8086.asm
 	cp 8086.asm 8086.s
-	$(ASM) 8086.s
+	$(ASM) -o $@ 8086.s
 	rm -f 8086.s
 
 _zmatch.o:	zmatch.S
 	$(CPP) $(ASMDEF) zmatch.S > _zmatch.s
-	$(ASM) _zmatch.s
+	$(ASM) -o $@ _zmatch.s
 	rm -f _zmatch.s
 
 #mc68020.o:
@@ -88,9 +113,9 @@ OBJ1 =	pgp.o crypto.o keymgmt.o fileio.o
 	mdfile.o more.o armor.o mpilib.o mpiio.o \
 	genprime.o rsagen.o random.o idea.o passwd.o \
 	md5.o system.o language.o getopt.o keyadd.o \
-	config.o keymaint.o charset.o
+	config.o keymaint.o charset.o rsaglue.o
 
-OBJS =	$(OBJ1) $(ZIPOBJS) $(OBJS_EXT)
+OBJS =	$(OBJ1) $(ZIPOBJS) $(OBJS_EXT) $(RSAOBJS)
 
 $(PROJ):	$(OBJS)
 		$(LD) -o $(PROJ) $(OBJS) $(LDFLAGS) $(LIBS_EXT)
@@ -286,12 +311,17 @@ aux: unproto/cpp
 	LDFLAGS=-lposix \
 	CFLAGS="-B unproto/ -tp -DSVR2 \
 	-DHIGHFIRST -DUNIX -DPORTABLE -DUSE_SELECT -DUPTON"
+aux-gcc:
+	$(MAKE) all CC=gcc LD=gcc \
+	LDFLAGS=-lposix \
+	CFLAGS="-O2 -DSVR2 -traditional-cpp \
+	-DHIGHFIRST -DUNIX -DPORTABLE -DUSE_SELECT -DUPTON"
 
 # optimized version with 80386.S for emx 0.8e, OS/2 2.0 or DOS
 os2:
 	$(MAKE) all PROJ=pgp.exe OBJS_EXT="_80386.o _zmatch.o" \
-	CC="gcc" CFLAGS="-O -DOS2 -DASM -DIDEA32" \
-	ASM="gcc -c" LD="gcc" LDFLAGS="pgp.def"
+	CC="gcc -Zomf" CFLAGS="-O -DOS2 -DASM -DIDEA32" \
+	ASM="gcc -Zomf -c" LD="gcc" LDFLAGS="-s pgp.def"
 
 # DJGPP, DJ Delorie's port of GNU C to MS-DOA (thanks DJ!).  Tested with dmake.
 # You may have to rehack this -- I'm not good with makefiles.
@@ -324,13 +354,13 @@ tags:
 
 ## Dependencies ##
 armor.o : armor.c mpilib.h usuals.h platform.h fileio.h mpiio.h language.h \
-  pgp.h more.h armor.h crypto.h 
+  pgp.h more.h armor.h crypto.h
 charset.o : charset.c usuals.h language.h charset.h system.h 
 config.o : config.c usuals.h fileio.h pgp.h more.h armor.h config.h \
   charset.h 
 crypto.o : crypto.c mpilib.h usuals.h platform.h mpiio.h random.h idea.h \
   crypto.h keymgmt.h keymaint.h mdfile.h md5.h fileio.h charset.h language.h \
-  pgp.h more.h armor.h exitpgp.h zipup.h 
+  pgp.h more.h armor.h exitpgp.h zipup.h rsaglue.h
 fileio.o : fileio.c random.h usuals.h mpilib.h platform.h mpiio.h fileio.h \
   language.h pgp.h more.h armor.h exitpgp.h charset.h system.h 
 genprime.o : genprime.c mpilib.h usuals.h platform.h genprime.h random.h 
@@ -352,15 +382,16 @@ mdfile.o : mdfile.c mpilib.h usuals.h pl
   language.h pgp.h more.h armor.h 
 more.o : more.c system.h mpilib.h usuals.h platform.h language.h fileio.h \
   pgp.h more.h armor.h charset.h 
-mpiio.o : mpiio.c mpilib.h usuals.h platform.h mpiio.h pgp.h more.h armor.h 
-mpilib.o : mpilib.c mpilib.h usuals.h platform.h 
+mpiio.o : mpiio.c mpilib.h # usuals.h platform.h mpiio.h pgp.h more.h armor.h 
+mpilib.o : mpilib.c mpilib.h # usuals.h platform.h 
 passwd.o : passwd.c random.h usuals.h md5.h language.h pgp.h more.h armor.h 
 pgp.o : pgp.c system.h mpilib.h usuals.h platform.h random.h crypto.h \
   fileio.h keymgmt.h language.h pgp.h more.h armor.h exitpgp.h charset.h \
-  getopt.h config.h keymaint.h keyadd.h 
+  getopt.h config.h keymaint.h keyadd.h rsaglue.h
 random.o : random.c system.h random.h usuals.h language.h 
 rsagen.o : rsagen.c mpilib.h usuals.h platform.h genprime.h rsagen.h \
-  random.h 
+  random.h rsaglue.h
+rsaglue.o : rsaglue.c mpilib.h mpiio.h pgp.h rsaglue.h
 system.o : system.c exitpgp.h system.h charset.h 
 zbits.o : zbits.c zip.h ztailor.h ziperr.h 
 zdeflate.o : zdeflate.c zunzip.h usuals.h system.h zip.h ztailor.h ziperr.h