Expose RSAPublicBlock() and RSAPrivateBlock() for the benefit of hpack.

Also clean up the package a bit while we're here; allow ${CC} from the
environment.  Now called "rsaref-2.0p1".

4 files changed, 55 insertions, 29 deletions

diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index 5cb0e79a934..9cb97aca01b 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 1999/04/25 19:10:16 tv Exp $
+# $NetBSD: Makefile,v 1.14 1999/05/23 21:12:01 tv Exp $
 #
 
 DISTNAME=		rsaref
-PKGNAME=		rsaref-2.0
+PKGNAME=		rsaref-2.0p1
 WRKSRC=			${WRKDIR}/install
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.spinnaker.com/pub/crypt/rsaref/
@@ -28,19 +28,16 @@ fetch-depends:
 	fi
 
 do-configure:
-	@${RM} -f ${WRKDIR}/source/md5.h
-	@${CP} ${FILESDIR}/md5.h ${WRKDIR}/source/
-	@${LN} -sf . ${WRKDIR}/source/rsaref
+	@${RM} -f ${WRKDIR}/source/md5.h && \
+		${ECHO} '#include_next <md5.h>' >${WRKDIR}/source/md5.h
+	@${RM} -f ${WRKDIR}/source/rsaref && ${LN} -sf . ${WRKDIR}/source/rsaref
 
 do-install:
 	${MKDIR} ${PREFIX}/include/rsaref ${PREFIX}/share/doc/rsaref
-	cd ${WRKSRC} && \
-		${LIBTOOL} --mode=install ${INSTALL_DATA} \
-			librsaref.la ${PREFIX}/lib
-	cd ${WRKDIR}/source && \
-		${INSTALL_DATA} des.h global.h md2.h md5.h rsa.h rsaref.h \
-			${PREFIX}/include/rsaref/
-	cd ${WRKDIR}/doc && \
-		${INSTALL_DATA} info.txt rsaref.txt ${PREFIX}/share/doc/rsaref/
+	cd ${WRKSRC} && ${LIBTOOL} ${INSTALL_DATA} librsaref.la ${PREFIX}/lib
+.for file in des.h global.h md2.h md5.h rsa.h rsaref.h
+	${INSTALL_DATA} ${WRKDIR}/source/${file} ${PREFIX}/include/rsaref/
+.endfor
+	cd ${WRKDIR}/doc && ${INSTALL_DATA} info.txt rsaref.txt ${PREFIX}/share/doc/rsaref/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/rsaref/files/md5.h b/security/rsaref/files/md5.h
deleted file mode 100644
index 17d8998f948..00000000000
--- a/security/rsaref/files/md5.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* $NetBSD: md5.h,v 1.1.1.1 1998/03/18 00:49:33 tv Exp $ */
-/* Include the system md5.h header file. */
-#ifndef _MD5_H_
-#include_next <md5.h>
-#endif
diff --git a/security/rsaref/patches/patch-ag b/security/rsaref/patches/patch-ag
index c7304991650..04497768079 100644
--- a/security/rsaref/patches/patch-ag
+++ b/security/rsaref/patches/patch-ag
@@ -1,21 +1,16 @@
-$NetBSD: patch-ag,v 1.3 1998/10/02 22:52:49 tv Exp $
-
 --- unix/makefile.orig	Fri Mar 25 14:01:31 1994
-+++ unix/makefile	Tue Jul 14 13:52:28 1998
-@@ -1,11 +1,10 @@
- # This is a makefile for UNIX
- 
- # extension for object files
++++ unix/makefile	Sun May 23 17:02:59 1999
+@@ -4,8 +4,7 @@
  O = o
  
  # commands
 -CC = cc
 -LIB = ar
-+CC = ${LIBTOOL} --mode=compile cc
++CC := ${LIBTOOL} ${CC}
  
  # name of temporary library script
  TEMPFILE = $(TEMP)/temp.mak
-@@ -14,7 +14,7 @@
+@@ -14,18 +13,18 @@
  STDINCDIR=/usr/include
  
  # The places to look for include files (in order).
@@ -24,7 +19,11 @@ $NetBSD: patch-ag,v 1.3 1998/10/02 22:52:49 tv Exp $
  
  # name of main executable to build
  PROG = all
-@@ -25,7 +25,7 @@
+ 
+ # Normal C flags.
+-CFLAGS = $(INCL) -O -c -DPROTOTYPES=1
++CFLAGS += $(INCL) -c -DPROTOTYPES=1
+ MFLAGS = -I. -I$(RSAREFDIR)
  
  # The location of the common source directory.
  RSAREFDIR = ../source/
@@ -33,7 +32,7 @@ $NetBSD: patch-ag,v 1.3 1998/10/02 22:52:49 tv Exp $
  
  # The location of the demo source directory.
  RDEMODIR = ../rdemo/
-@@ -38,11 +38,10 @@
+@@ -38,11 +37,10 @@
  dhdemo : dhdemo.$(O) $(RSAREFLIB)
  	cc -o $@ dhdemo.$(O) $(RSAREFLIB)
  
diff --git a/security/rsaref/patches/patch-ah b/security/rsaref/patches/patch-ah
new file mode 100644
index 00000000000..24bb20d57e3
--- /dev/null
+++ b/security/rsaref/patches/patch-ah
@@ -0,0 +1,35 @@
+$NetBSD: patch-ah,v 1.1 1999/05/23 21:12:01 tv Exp $
+
+--- ../source/rsa.c.orig	Sun May 23 16:57:34 1999
++++ ../source/rsa.c	Sun May 23 16:57:58 1999
+@@ -11,10 +11,10 @@
+ #include "rsa.h"
+ #include "nn.h"
+ 
+-static int RSAPublicBlock PROTO_LIST 
++int RSAPublicBlock PROTO_LIST 
+   ((unsigned char *, unsigned int *, unsigned char *, unsigned int,
+     R_RSA_PUBLIC_KEY *));
+-static int RSAPrivateBlock PROTO_LIST 
++int RSAPrivateBlock PROTO_LIST 
+   ((unsigned char *, unsigned int *, unsigned char *, unsigned int,
+     R_RSA_PRIVATE_KEY *));
+ 
+@@ -212,7 +212,7 @@
+    Assumes inputLen < length of modulus.
+    Requires input < modulus.
+  */
+-static int RSAPublicBlock (output, outputLen, input, inputLen, publicKey)
++int RSAPublicBlock (output, outputLen, input, inputLen, publicKey)
+ unsigned char *output;                                      /* output block */
+ unsigned int *outputLen;                          /* length of output block */
+ unsigned char *input;                                        /* input block */
+@@ -252,7 +252,7 @@
+    Assumes inputLen < length of modulus.
+    Requires input < modulus.
+  */
+-static int RSAPrivateBlock (output, outputLen, input, inputLen, privateKey)
++int RSAPrivateBlock (output, outputLen, input, inputLen, privateKey)
+ unsigned char *output;                                      /* output block */
+ unsigned int *outputLen;                          /* length of output block */
+ unsigned char *input;                                        /* input block */