Module Name: src
Committed By: agc
Date: Mon Nov 29 06:21:40 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: Makefile.am Makefile.in
bufgap.c misc.c ssh2pgp.c
Removed Files:
src/crypto/external/bsd/netpgp/dist/src/lib: fastctype.c fastctype.h
Log Message:
I forgot that the fastctype.[ch] files were still in this directory, and
have no need to be here - remove them, and just use native <ctype.h>
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/netpgp/dist/src/lib/bufgap.c
cvs rdiff -u -r1.2 -r0 \
src/crypto/external/bsd/netpgp/dist/src/lib/fastctype.c
cvs rdiff -u -r1.3 -r0 \
src/crypto/external/bsd/netpgp/dist/src/lib/fastctype.h
cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/netpgp/dist/src/lib/misc.c
cvs rdiff -u -r1.20 -r1.21 \
src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.9 src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.10
--- src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.9 Sat Nov 6 03:42:59 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am Mon Nov 29 06:21:40 2010
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile.am,v 1.9 2010/11/06 03:42:59 agc Exp $
+## $NetBSD: Makefile.am,v 1.10 2010/11/29 06:21:40 agc Exp $
AM_CFLAGS = $(WARNCFLAGS)
@@ -11,7 +11,6 @@
compress.c \
create.c \
crypto.c \
- fastctype.c \
keyring.c \
misc.c \
netpgp.c \
Index: src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.14 src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.15
--- src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.14 Sat Nov 6 03:42:59 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in Mon Nov 29 06:21:40 2010
@@ -55,7 +55,7 @@
libnetpgp_la_DEPENDENCIES = ../libmj/libmj.la
am_libnetpgp_la_OBJECTS = libnetpgp_la-bufgap.lo \
libnetpgp_la-compress.lo libnetpgp_la-create.lo \
- libnetpgp_la-crypto.lo libnetpgp_la-fastctype.lo \
+ libnetpgp_la-crypto.lo \
libnetpgp_la-keyring.lo libnetpgp_la-misc.lo \
libnetpgp_la-netpgp.lo libnetpgp_la-openssl_crypto.lo \
libnetpgp_la-packet-parse.lo libnetpgp_la-packet-print.lo \
@@ -210,7 +210,6 @@
compress.c \
create.c \
crypto.c \
- fastctype.c \
keyring.c \
misc.c \
netpgp.c \
@@ -318,7 +317,6 @@
@AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libnetpgp_la-compress....@am__quote@
@AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libnetpgp_la-create....@am__quote@
@AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libnetpgp_la-crypto....@am__quote@
-...@amdep_true@@am__include@ @am__qu...@./$(DEPDIR)/libnetpgp_la-fastctype....@am__quote@
@AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libnetpgp_la-keyring....@am__quote@
@AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libnetpgp_la-misc....@am__quote@
@AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libnetpgp_la-netpgp....@am__quote@
@@ -382,13 +380,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnetpgp_la-crypto.lo `test -f 'crypto.c' || echo '$(srcdir)/'`crypto.c
-libnetpgp_la-fastctype.lo: fastctype.c
-...@am__fastdepcc_true@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnetpgp_la-fastctype.lo -MD -MP -MF $(DEPDIR)/libnetpgp_la-fastctype.Tpo -c -o libnetpgp_la-fastctype.lo `test -f 'fastctype.c' || echo '$(srcdir)/'`fastctype.c
-...@am__fastdepcc_true@ mv -f $(DEPDIR)/libnetpgp_la-fastctype.Tpo $(DEPDIR)/libnetpgp_la-fastctype.Plo
-...@amdep_true@@am__fastdepCC_FALSE@ source='fastctype.c' object='libnetpgp_la-fastctype.lo' libtool=yes @AMDEPBACKSLASH@
-...@amdep_true@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-...@am__fastdepcc_false@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnetpgp_la-fastctype.lo `test -f 'fastctype.c' || echo '$(srcdir)/'`fastctype.c
-
libnetpgp_la-keyring.lo: keyring.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnetpgp_la-keyring.lo -MD -MP -MF $(DEPDIR)/libnetpgp_la-keyring.Tpo -c -o libnetpgp_la-keyring.lo `test -f 'keyring.c' || echo '$(srcdir)/'`keyring.c
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libnetpgp_la-keyring.Tpo $(DEPDIR)/libnetpgp_la-keyring.Plo
Index: src/crypto/external/bsd/netpgp/dist/src/lib/bufgap.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/bufgap.c:1.4 src/crypto/external/bsd/netpgp/dist/src/lib/bufgap.c:1.5
--- src/crypto/external/bsd/netpgp/dist/src/lib/bufgap.c:1.4 Sun Aug 15 16:10:56 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/bufgap.c Mon Nov 29 06:21:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bufgap.c,v 1.4 2010/08/15 16:10:56 agc Exp $ */
+/* $NetBSD: bufgap.c,v 1.5 2010/11/29 06:21:40 agc Exp $ */
/*-
* Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -38,8 +38,8 @@
#include <sys/stat.h>
#endif
+#include <ctype.h>
#include <stdio.h>
-
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
@@ -50,7 +50,6 @@
#include <string.h>
#endif
-#include "fastctype.h"
#include "bufgap.h"
#include "defs.h"
Index: src/crypto/external/bsd/netpgp/dist/src/lib/misc.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.39 src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.40
--- src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.39 Thu Nov 11 00:58:04 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/misc.c Mon Nov 29 06:21:40 2010
@@ -57,13 +57,14 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: misc.c,v 1.39 2010/11/11 00:58:04 agc Exp $");
+__RCSID("$NetBSD: misc.c,v 1.40 2010/11/29 06:21:40 agc Exp $");
#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/mman.h>
+#include <ctype.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
@@ -81,7 +82,6 @@
#include "packet.h"
#include "crypto.h"
#include "create.h"
-#include "fastctype.h"
#include "packet-parse.h"
#include "packet-show.h"
#include "signature.h"
@@ -1347,7 +1347,7 @@
{
int n;
- for (n = 0 ; *s1 && *s2 && (n = tolower(*s1) - tolower(*s2)) == 0 ; s1++, s2++) {
+ for (n = 0 ; *s1 && *s2 && (n = tolower((uint8_t)*s1) - tolower((uint8_t)*s2)) == 0 ; s1++, s2++) {
}
return n;
}
Index: src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c:1.20 src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c:1.21
--- src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c:1.20 Sun Nov 7 21:41:39 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c Mon Nov 29 06:21:40 2010
@@ -40,9 +40,9 @@
#include <arpa/inet.h>
+#include <ctype.h>
#include <inttypes.h>
#include <stdio.h>
-
#include <stdlib.h>
#include <string.h>
@@ -61,7 +61,6 @@
#include <openssl/pem.h>
#include "bufgap.h"
-#include "fastctype.h"
#include "packet-parse.h"
#include "netpgpdefs.h"
