diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-10-25 18:02:31 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-10-25 18:02:31 +0000 |
commit | f155dc3ddca47e3baa9a31630aac238232becd83 (patch) | |
tree | e41d0b4eb7fac97a36c95f527537815a4bf892db /security | |
parent | 98fa9be4347f87106291da9f0232922c82d889c4 (diff) |
Notes
Diffstat (limited to 'security')
-rw-r--r-- | security/Makefile | 4 | ||||
-rw-r--r-- | security/its4/Makefile | 41 | ||||
-rw-r--r-- | security/its4/distinfo | 2 | ||||
-rw-r--r-- | security/its4/files/patch-aa | 11 | ||||
-rw-r--r-- | security/its4/files/patch-ab | 11 | ||||
-rw-r--r-- | security/its4/pkg-descr | 11 | ||||
-rw-r--r-- | security/its4/pkg-plist | 4 | ||||
-rw-r--r-- | security/pam_af/Makefile | 36 | ||||
-rw-r--r-- | security/pam_af/distinfo | 2 | ||||
-rw-r--r-- | security/pam_af/pkg-descr | 5 | ||||
-rw-r--r-- | security/pam_af/pkg-plist | 4 | ||||
-rw-r--r-- | security/py-rijndael/Makefile | 32 | ||||
-rw-r--r-- | security/py-rijndael/distinfo | 2 | ||||
-rw-r--r-- | security/py-rijndael/pkg-descr | 3 | ||||
-rw-r--r-- | security/py-rijndael/pkg-plist | 3 | ||||
-rw-r--r-- | security/sscep/Makefile | 25 | ||||
-rw-r--r-- | security/sscep/distinfo | 2 | ||||
-rw-r--r-- | security/sscep/files/BSDmakefile | 24 | ||||
-rw-r--r-- | security/sscep/files/patch-warnings | 329 | ||||
-rw-r--r-- | security/sscep/pkg-descr | 6 | ||||
-rw-r--r-- | security/sscep/pkg-plist | 3 |
21 files changed, 0 insertions, 560 deletions
diff --git a/security/Makefile b/security/Makefile index 795412bc4f37..a7e2a4c17b3c 100644 --- a/security/Makefile +++ b/security/Makefile @@ -226,7 +226,6 @@ SUBDIR += ipv6toolkit SUBDIR += isakmpd SUBDIR += isnprober - SUBDIR += its4 SUBDIR += jbrofuzz SUBDIR += john SUBDIR += kedpm @@ -594,7 +593,6 @@ SUBDIR += pam-mysql SUBDIR += pam-pgsql SUBDIR += pam_abl - SUBDIR += pam_af SUBDIR += pam_alreadyloggedin SUBDIR += pam_authsrv SUBDIR += pam_bsdbioapi @@ -756,7 +754,6 @@ SUBDIR += py-pylibacl SUBDIR += py-pyme SUBDIR += py-pysha3 - SUBDIR += py-rijndael SUBDIR += py-rsa SUBDIR += py-ssh SUBDIR += py-sslstrip @@ -891,7 +888,6 @@ SUBDIR += squidclamav SUBDIR += srm SUBDIR += srp - SUBDIR += sscep SUBDIR += ssdeep SUBDIR += ssh-copy-id SUBDIR += ssh-gui diff --git a/security/its4/Makefile b/security/its4/Makefile deleted file mode 100644 index 7567e0869240..000000000000 --- a/security/its4/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# New ports collection makefile for: its4 -# Date created: 21 February 2000 -# Whom: Chris D. Faulhaber <jedgar@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= its4 -PORTVERSION= 1.1.1 -CATEGORIES= security -MASTER_SITES= # Empty -EXTRACT_SUFX= .tgz - -MAINTAINER= ports@FreeBSD.org -COMMENT= Tool to scan C/C++ source for potential vulnerabilities - -DEPRECATED= No more public distfiles -EXPIRATION_DATE= 2012-10-20 - -WRKSRC= ${WRKDIR}/${PORTNAME} -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} \ - --datadir=${PREFIX}/share/its4 -MAN1= its4.1 - -.include <bsd.port.pre.mk> - -.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING) -IGNORE= may not be automatically fetched due to licensing restrictions.\ -You MUST fetch the source manually from: http://www.cigital.com/its4/download.html; Once\ -${DISTFILES} has been downloaded, move it to ${DISTDIR} and then restart this build -.endif - -post-install: - @${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/its4 - @${ECHO} - @${ECHO} "This software is for non-commercial use only. See" - @${ECHO} "${PREFIX}/share/its4/LICENSE for details." - @${ECHO} - -.include <bsd.port.post.mk> diff --git a/security/its4/distinfo b/security/its4/distinfo deleted file mode 100644 index 53af0ec9be28..000000000000 --- a/security/its4/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (its4-1.1.1.tgz) = 386ca694c969108863f3e5c0571ea8c5cbdc288dd13e12ba573a592844682df4 -SIZE (its4-1.1.1.tgz) = 59759 diff --git a/security/its4/files/patch-aa b/security/its4/files/patch-aa deleted file mode 100644 index bb7814574c45..000000000000 --- a/security/its4/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Thu Sep 28 10:55:22 2000 -+++ configure Mon Oct 2 06:32:36 2000 -@@ -18,7 +18,7 @@ - DATADIR= - MANDIR= - PROGNAME=its4 --OPTIMIZATION=-O3 -+OPTIMIZATION=${CFLAGS} - QUIET= - CC= - INSTALLPROG= diff --git a/security/its4/files/patch-ab b/security/its4/files/patch-ab deleted file mode 100644 index 6e3c9cbf2a0b..000000000000 --- a/security/its4/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Mon Feb 21 11:53:17 2000 -+++ Makefile.in Tue Feb 22 09:16:02 2000 -@@ -24,7 +24,7 @@ - $(INSTALL) vulns.i4d $(INSTALL_DATADIR) - $(INSTALL) -d $(INSTALL_MANDIR)/man1 - $(INSTALL) docs/its4.1 $(INSTALL_MANDIR)/man1/ -- echo "Installation complete." -+ @echo "Installation complete." - - # Dependencies generated by g++ -M *.C | dependstrip >> Makefile.in - config.o: config.C config.H vulninfo.H formatter.H vulndb.H dict.H fatal.H query.H strpool.H diff --git a/security/its4/pkg-descr b/security/its4/pkg-descr deleted file mode 100644 index 96dc28eb4093..000000000000 --- a/security/its4/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -ITS4 is a tool that statically scans C and C++ source code for -potential security vulnerabilities. It is a command-line tool that -works across Unix environments (hopefully) and will also work under -Windows with CygWin installed. ITS4 scans code, looking for function -calls that are potentially dangerous. For some calls, ITS4 tries to -perform some code analysis to determine how risky the call is. In -each case, ITS4 provides a problem report, including a short -description of the potential problem and suggestions on how to fix the -code. - -WWW: http://www.cigital.com/its4/ diff --git a/security/its4/pkg-plist b/security/its4/pkg-plist deleted file mode 100644 index 44753efe81b4..000000000000 --- a/security/its4/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -bin/its4 -share/its4/vulns.i4d -share/its4/LICENSE -@dirrm share/its4 diff --git a/security/pam_af/Makefile b/security/pam_af/Makefile deleted file mode 100644 index 2214a7102da3..000000000000 --- a/security/pam_af/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# Ports collection makefile for: pam_af -# Date created: 5 Marth 2006 -# Whom: Stanislav Sedov <ssedov@mbsd.msk.ru> -# -# $FreeBSD$ -# - -PORTNAME= pam_af -PORTVERSION= 1.0.2 -PORTREVISION= 0 -CATEGORIES= security -MASTER_SITES= http://mbsd.msk.ru/dist/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= Anti-bruteforce PAM module - -DEPRECATED= No more public distfiles -EXPIRATION_DATE= 2012-10-20 - -USE_BZIP2= yes - -MAN8= pam_af.8 pam_af_tool.8 - -do-install: - ${INSTALL_DATA} ${WRKSRC}/pam_af.so ${PREFIX}/lib - ${INSTALL_PROGRAM} ${WRKSRC}/pam_af_tool/pam_af_tool ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/pam_af.8 ${MANPREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/pam_af_tool/pam_af_tool.8 ${MANPREFIX}/man/man8 - -post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif - -.include <bsd.port.mk> diff --git a/security/pam_af/distinfo b/security/pam_af/distinfo deleted file mode 100644 index b4216ca6a294..000000000000 --- a/security/pam_af/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (pam_af-1.0.2.tar.bz2) = 9276ad2eff18a373f5ab00ee302e5c6ab2266805b9668a5e248c94435457b050 -SIZE (pam_af-1.0.2.tar.bz2) = 17991 diff --git a/security/pam_af/pkg-descr b/security/pam_af/pkg-descr deleted file mode 100644 index 2feb90763b19..000000000000 --- a/security/pam_af/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Anti-bruteforce PAM module for authentification services. It can be used to -prevent brute-force attacks on services like SSH or Telnet. It's highly -configurable and very fast. - -WWW: http://mbsd.msk.ru/stas/pam_af.html diff --git a/security/pam_af/pkg-plist b/security/pam_af/pkg-plist deleted file mode 100644 index ceae60064fc7..000000000000 --- a/security/pam_af/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -lib/pam_af.so -sbin/pam_af_tool -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/security/py-rijndael/Makefile b/security/py-rijndael/Makefile deleted file mode 100644 index babb9f0ad882..000000000000 --- a/security/py-rijndael/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# ex:ts=8 -# New ports collection makefile for: py-rijndael -# Date created: Jul 23, 2001 -# Whom: ijliao -# -# $FreeBSD$ -# - -PORTNAME= rijndael -PORTVERSION= 1.4 -CATEGORIES= security python -MASTER_SITES= http://jclement.ca/software/pyrijndael/ -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= pyrijndael-v${PORTVERSION:S:.:_:} - -MAINTAINER= ports@FreeBSD.org -COMMENT= A pure python implementation of the Rijndael encryption algorithm - -DEPRECATED= No more public distfiles -EXPIRATION_DATE= 2012-10-20 - -USE_PYTHON= yes -WRKSRC= ${WRKDIR}/pyrijndael - -do-build: - @cd ${WRKSRC} && ${PYTHON_CMD} -c 'import pyRijndael' - @cd ${WRKSRC} && ${PYTHON_CMD} -O -c 'import pyRijndael' - -do-install: - @${INSTALL_DATA} ${WRKSRC}/pyRijndael.* ${PYTHON_SITELIBDIR} - -.include <bsd.port.mk> diff --git a/security/py-rijndael/distinfo b/security/py-rijndael/distinfo deleted file mode 100644 index 9f5a0ba7ec2b..000000000000 --- a/security/py-rijndael/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (pyrijndael-v1_4.tar.gz) = f9bbd6020f1db81136c91fb00037b8b18dce629d3e1ca0684c64bdfda3ec8e8f -SIZE (pyrijndael-v1_4.tar.gz) = 5195 diff --git a/security/py-rijndael/pkg-descr b/security/py-rijndael/pkg-descr deleted file mode 100644 index 27198065762b..000000000000 --- a/security/py-rijndael/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -A pure python implementation of the Rijndael encryption algorithm. Useful for -quick string encryption in python programs but probably is not fast enough for -anything too big. diff --git a/security/py-rijndael/pkg-plist b/security/py-rijndael/pkg-plist deleted file mode 100644 index ae3084076274..000000000000 --- a/security/py-rijndael/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -%%PYTHON_SITELIBDIR%%/pyRijndael.py -%%PYTHON_SITELIBDIR%%/pyRijndael.pyc -%%PYTHON_SITELIBDIR%%/pyRijndael.pyo diff --git a/security/sscep/Makefile b/security/sscep/Makefile deleted file mode 100644 index c1319796c14f..000000000000 --- a/security/sscep/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# New ports collection makefile for: sscep -# Date created: Feb 15 2005 -# Whom: Vsevolod Stakhov -# -# $FreeBSD$ -# - -PORTNAME= sscep -PORTVERSION= 20071227 -CATEGORIES= security -MASTER_SITES= http://www.klake.org/~jt/sscep/ -DISTNAME= ${PORTNAME} -EXTRACT_SUFX= .tgz - -MAINTAINER= ports@FreeBSD.org -COMMENT= Simple scep client -MAKEFILE= ${FILESDIR}/BSDmakefile -ALL_TARGET= -j`${SYSCTL} -n hw.ncpu` - -DEPRECATED= No more public distfiles -EXPIRATION_DATE= 2012-10-20 - -USE_OPENSSL= yes - -.include <bsd.port.mk> diff --git a/security/sscep/distinfo b/security/sscep/distinfo deleted file mode 100644 index f1bb68119b4b..000000000000 --- a/security/sscep/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (sscep.tgz) = 0739bbade24054ff73102e0ef9d43ac7e51be9588ae4b6bd4c7e595a16bbfbcd -SIZE (sscep.tgz) = 101742 diff --git a/security/sscep/files/BSDmakefile b/security/sscep/files/BSDmakefile deleted file mode 100644 index 1152a5a82efb..000000000000 --- a/security/sscep/files/BSDmakefile +++ /dev/null @@ -1,24 +0,0 @@ -BINDIR = ${PREFIX}/bin -MANDIR = ${PREFIX}/man/man8 - -.if !empty(OPENSSLBASE) && ${OPENSSLBASE} != "/usr" -CFLAGS+= -I${OPENSSLINC} -LDADD+= -L${OPENSSLLIB} -.endif -LDADD+= -lcrypto - -WARNS = 3 - -# Manual page appears to have been removed from the distribution. -# This is being investigated... -#MAN8 = sscep.8 -NO_MAN = yes - -PROG = sscep -SRCS = sscep.c init.c net.c sceputils.c pkcs7.c ias.c fileutils.c - -beforeinstall: - ${BSD_INSTALL_SCRIPT} ${.CURDIR}/mkrequest ${BINDIR}/ - ${BSD_INSTALL_DATA} ${.CURDIR}/sscep.conf ${PREFIX}/etc/sscep.conf.sample - -.include <bsd.prog.mk> diff --git a/security/sscep/files/patch-warnings b/security/sscep/files/patch-warnings deleted file mode 100644 index 4c854a88e093..000000000000 --- a/security/sscep/files/patch-warnings +++ /dev/null @@ -1,329 +0,0 @@ -Fix a lot of warnings and (what seems to be) two errors... - - -mi - ---- ias.h 2006-03-13 06:45:20.000000000 -0500 -+++ ias.h 2008-04-29 10:03:02.000000000 -0400 -@@ -6,13 +6,6 @@ - */ - --/* Macros */ -- --#define i2d_pkcs7_issuer_and_subject_bio(bp, ias) \ -- ASN1_i2d_bio(i2d_pkcs7_issuer_and_subject, bp, (unsigned char *)ias) --#define i2d_PKCS7_ISSUER_AND_SERIAL_bio(bp, ias) \ -- ASN1_i2d_bio(i2d_PKCS7_ISSUER_AND_SERIAL, bp, (unsigned char *)ias) -- - /* Routines */ --int i2d_pkcs7_issuer_and_subject(pkcs7_issuer_and_subject *, unsigned char **); -+int i2d_pkcs7_issuer_and_subject(void *, unsigned char **); - pkcs7_issuer_and_subject * - d2i_pkcs7_issuer_and_subject(pkcs7_issuer_and_subject **, unsigned char **, ---- net.c 2007-12-27 01:08:39.000000000 -0500 -+++ net.c 2008-04-29 10:03:02.000000000 -0400 -@@ -151,13 +151,13 @@ - - /* URL-encode the input and return back encoded string */ --char * url_encode(char *s, size_t n) { -+char * url_encode(const char *s, size_t n) { - char *r; - size_t len; -- int i; -+ size_t i; - char ch[2]; - - /* Allocate 2 times bigger space than the original string */ - len = 2 * n; -- r = (char *)malloc(len); -+ r = malloc(len); - if (r == NULL) { - return NULL; ---- pkcs7.c 2006-03-13 06:45:21.000000000 -0500 -+++ pkcs7.c 2008-04-29 10:03:02.000000000 -0400 -@@ -10,4 +10,18 @@ - #include "ias.h" - -+static int -+pkcs7_translator(void *p, unsigned char **out) -+{ -+ return i2d_PKCS7_ISSUER_AND_SERIAL(p, out); -+} -+#define i2d_pkcs7_issuer_and_subject_bio(bp, ias) \ -+ ASN1_i2d_bio(i2d_pkcs7_issuer_and_subject, bp, (unsigned char *)ias) -+#define i2d_PKCS7_ISSUER_AND_SERIAL_bio(bp, ias) \ -+ ASN1_i2d_bio(pkcs7_translator, bp, (unsigned char *)ias) -+ -+static int add_attribute_string(STACK_OF(X509_ATTRIBUTE) *, int, -+ const char *); -+static int add_attribute_octet(STACK_OF(X509_ATTRIBUTE) *, int, -+ const char *, int); - /* - * Wrap data in PKCS#7 envelopes and base64-encode the result. -@@ -64,5 +78,5 @@ - exit (SCEP_PKISTATUS_P7); - } -- BIO_flush(databio); -+ (void)BIO_flush(databio); - BIO_set_flags(databio, BIO_FLAGS_MEM_RDONLY); - break; -@@ -90,5 +104,5 @@ - exit (SCEP_PKISTATUS_P7); - } -- BIO_flush(databio); -+ (void)BIO_flush(databio); - BIO_set_flags(databio, BIO_FLAGS_MEM_RDONLY); - break; -@@ -100,5 +114,5 @@ - /* Signer cert */ - signercert = localcert; -- signercert = rsa; -+ signerkey = rsa; - - /* Read data in memory bio */ -@@ -111,5 +125,5 @@ - exit (SCEP_PKISTATUS_P7); - } -- BIO_flush(databio); -+ (void)BIO_flush(databio); - BIO_set_flags(databio, BIO_FLAGS_MEM_RDONLY); - break; -@@ -121,5 +135,5 @@ - /* Signer cert */ - signercert = localcert; -- signercert = rsa; -+ signerkey = rsa; - - /* Read data in memory bio */ -@@ -132,5 +146,5 @@ - exit (SCEP_PKISTATUS_P7); - } -- BIO_flush(databio); -+ (void)BIO_flush(databio); - BIO_set_flags(databio, BIO_FLAGS_MEM_RDONLY); - break; -@@ -195,5 +209,5 @@ - exit (SCEP_PKISTATUS_P7); - } -- BIO_flush(memorybio); -+ (void)BIO_flush(memorybio); - BIO_set_flags(memorybio, BIO_FLAGS_MEM_RDONLY); - len = BIO_get_mem_data(memorybio, &buffer); -@@ -298,5 +312,5 @@ - /* Copy PKCS#7 */ - i2d_PKCS7_bio(outbio, s->request_p7); -- BIO_flush(outbio); -+ (void)BIO_flush(outbio); - BIO_set_flags(memorybio, BIO_FLAGS_MEM_RDONLY); - s->request_len = BIO_get_mem_data(memorybio, &s->request_payload); -@@ -370,5 +384,5 @@ - BIO_write(outbio, buffer, bytes); - } -- BIO_flush(outbio); -+ (void)BIO_flush(outbio); - if (v_flag) - printf("%s: PKCS#7 contains %d bytes of enveloped data\n", -@@ -584,5 +598,5 @@ - exit (SCEP_PKISTATUS_P7); - } -- BIO_flush(outbio); -+ (void)BIO_flush(outbio); - - /* Write decrypted data */ -@@ -599,6 +613,6 @@ - - /* Add signed attributes */ --int --add_attribute_string(STACK_OF(X509_ATTRIBUTE) *attrs, int nid, char *buffer) { -+static int -+add_attribute_string(STACK_OF(X509_ATTRIBUTE) *attrs, int nid, const char *buffer) { - ASN1_STRING *asn1_string = NULL; - X509_ATTRIBUTE *x509_a; -@@ -623,6 +637,6 @@ - - } --int --add_attribute_octet(STACK_OF(X509_ATTRIBUTE) *attrs, int nid, char *buffer, -+static int -+add_attribute_octet(STACK_OF(X509_ATTRIBUTE) *attrs, int nid, const char *buffer, - int len) { - ASN1_STRING *asn1_string = NULL; ---- ias.c 2006-03-13 06:45:20.000000000 -0500 -+++ ias.c 2008-04-29 10:03:02.000000000 -0400 -@@ -15,7 +15,8 @@ - #include "ias.h" - --int i2d_pkcs7_issuer_and_subject(pkcs7_issuer_and_subject *a, -+int i2d_pkcs7_issuer_and_subject(void *pv, - unsigned char **pp) { - -+ pkcs7_issuer_and_subject *a = pv; - M_ASN1_I2D_vars(a); - M_ASN1_I2D_len(a->issuer,i2d_X509_NAME); ---- sceputils.c 2006-03-13 06:45:22.000000000 -0500 -+++ sceputils.c 2008-05-03 12:35:42.000000000 -0400 -@@ -48,5 +48,5 @@ - */ - int new_selfsigned(struct scep *s) { -- unsigned char *ptr; -+ const unsigned char *ptr; - X509 *cert; - X509_NAME *subject; -@@ -99,6 +99,11 @@ - } - /* Get serial no from transaction id */ -- ptr = (unsigned char *)s->transaction_id; -- if (!(serial = c2i_ASN1_INTEGER(NULL, &ptr, 32))) { -+ ptr = (const unsigned char *)s->transaction_id; -+#if OPENSSL_VERSION_NUMBER < 0x0090800fL -+# define CAST_CRUTCH (unsigned char **) -+#else -+# define CAST_CRUTCH -+#endif -+ if (!(serial = c2i_ASN1_INTEGER(NULL, CAST_CRUTCH&ptr, 32))) { - fprintf(stderr, "%s: error converting serial\n", pname); - ERR_print_errors_fp(stderr); -@@ -231,5 +236,5 @@ - - /* Assign space for ASCII presentation of the digest */ -- str = (unsigned char *)malloc(2 * MD5_DIGEST_LENGTH + 1); -+ str = malloc(2 * MD5_DIGEST_LENGTH + 1); /* XXX this is never freed */ - ret = str; - -@@ -246,5 +251,5 @@ - /* Copy as ASCII string and return: */ - for (c = 0; c < MD5_DIGEST_LENGTH; c++, str += 2) { -- sprintf((char *)str, "%02X", md[c]); -+ sprintf(str, "%02X", md[c]); - - } -@@ -252,4 +257,2 @@ - return(ret); - } -- -- ---- sscep.h 2007-12-27 01:15:38.000000000 -0500 -+++ sscep.h 2008-04-29 10:03:02.000000000 -0400 -@@ -139,7 +139,7 @@ - - /* Fingerprint, signing and encryption algorithms */ --EVP_MD *fp_alg; --EVP_MD *sig_alg; --EVP_CIPHER *enc_alg; -+const EVP_MD *fp_alg; -+const EVP_MD *sig_alg; -+const EVP_CIPHER *enc_alg; - - /* OpenSSL OID handles */ -@@ -188,5 +188,5 @@ - /* SCEP message types */ - int request_type; -- char *request_type_str; -+ const char *request_type_str; - int reply_type; - char *reply_type_str; -@@ -199,5 +199,5 @@ - - /* SCEP transaction attributes */ -- char *transaction_id; -+ const char *transaction_id; - unsigned char *sender_nonce; - int sender_nonce_len; -@@ -237,7 +237,4 @@ - int send_msg (struct http_reply *, char *, char *, int, int); - --/* Catch SIGALRM */ --void catchalarm (int); -- - /* Get config file parameter */ - char *get_string (char *); -@@ -291,10 +288,4 @@ - int pkcs7_unwrap(struct scep *); - --/* Add signed string attribute */ --int add_attribute_string(STACK_OF(X509_ATTRIBUTE) *, int, char *); -- --/* Add signed octet attribute */ --int add_attribute_octet(STACK_OF(X509_ATTRIBUTE) *, int, char *, int); -- - /* Find signed attributes */ - int get_signed_attribute(STACK_OF(X509_ATTRIBUTE) *, int, int, char **); -@@ -302,5 +293,5 @@ - - /* URL-endcode */ --char *url_encode (char *, size_t); -+char *url_encode (const char *, size_t); - - /* End of Functions */ ---- cmd.h 2006-03-13 06:45:14.000000000 -0500 -+++ cmd.h 2008-04-29 10:03:02.000000000 -0400 -@@ -45,5 +45,5 @@ - - /* CA identifier */ --char *i_char; -+const char *i_char; - int i_flag; - ---- sscep.c 2007-12-27 01:08:39.000000000 -0500 -+++ sscep.c 2008-04-29 10:03:15.000000000 -0400 -@@ -64,4 +64,10 @@ - } /* handle_serial */ - -+static void -+catchalarm(int signo __unused) { -+ fprintf(stderr, "%s: connection timed out\n", pname); -+ exit (SCEP_PKISTATUS_TIMEOUT); -+} -+ - int - main(int argc, char **argv) { -@@ -349,11 +355,11 @@ - /* Check algorithms */ - if (!E_flag) { -- enc_alg = (EVP_CIPHER *)EVP_des_cbc(); -+ enc_alg = EVP_des_cbc(); - } else if (!strncmp(E_char, "blowfish", 8)) { -- enc_alg = (EVP_CIPHER *)EVP_bf_cbc(); -+ enc_alg = EVP_bf_cbc(); - } else if (!strncmp(E_char, "des", 3)) { -- enc_alg = (EVP_CIPHER *)EVP_des_cbc(); -+ enc_alg = EVP_des_cbc(); - } else if (!strncmp(E_char, "3des", 4)) { -- enc_alg = (EVP_CIPHER *)EVP_des_ede3_cbc(); -+ enc_alg = EVP_des_ede3_cbc(); - } else { - fprintf(stderr, "%s: unsupported algorithm: %s\n", -@@ -362,9 +368,9 @@ - } - if (!S_flag) { -- sig_alg = (EVP_MD *)EVP_md5(); -+ sig_alg = EVP_md5(); - } else if (!strncmp(S_char, "md5", 3)) { -- sig_alg = (EVP_MD *)EVP_md5(); -+ sig_alg = EVP_md5(); - } else if (!strncmp(S_char, "sha1", 4)) { -- sig_alg = (EVP_MD *)EVP_sha1(); -+ sig_alg = EVP_sha1(); - } else { - fprintf(stderr, "%s: unsupported algorithm: %s\n", -@@ -374,9 +380,9 @@ - /* Fingerprint algorithm */ - if (!F_flag) { -- fp_alg = (EVP_MD *)EVP_md5(); -+ fp_alg = EVP_md5(); - } else if (!strncmp(F_char, "md5", 3)) { -- fp_alg = (EVP_MD *)EVP_md5(); -+ fp_alg = EVP_md5(); - } else if (!strncmp(F_char, "sha1", 4)) { -- fp_alg = (EVP_MD *)EVP_sha1(); -+ fp_alg = EVP_sha1(); - } else { - fprintf(stderr, "%s: unsupported algorithm: %s\n", -@@ -778,8 +784,2 @@ - exit(0); - } -- --void --catchalarm(int signo) { -- fprintf(stderr, "%s: connection timed out\n", pname); -- exit (SCEP_PKISTATUS_TIMEOUT); --} diff --git a/security/sscep/pkg-descr b/security/sscep/pkg-descr deleted file mode 100644 index 40a029f08516..000000000000 --- a/security/sscep/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -SCEP is a client-only implementation of the SCEP (Cisco System's Simple -Certificate Enrollment Protocol). SSCEP is designed for OpenBSD's isakmpd, -but it will propably work with any Unix system with a recent compiler and -OpenSSL toolkit libraries installed. - -WWW: http://www.klake.org/~jt/sscep/ diff --git a/security/sscep/pkg-plist b/security/sscep/pkg-plist deleted file mode 100644 index 0dd5c842bdce..000000000000 --- a/security/sscep/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -bin/sscep -bin/mkrequest -etc/sscep.conf.sample |