From owner-svn-src-all@FreeBSD.ORG Wed Feb 26 17:06:56 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0DB22D99; Wed, 26 Feb 2014 17:06:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E11D310A8; Wed, 26 Feb 2014 17:06:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1QH6tiS007047; Wed, 26 Feb 2014 17:06:55 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1QH6tqB007043; Wed, 26 Feb 2014 17:06:55 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201402261706.s1QH6tqB007043@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Wed, 26 Feb 2014 17:06:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r262529 - in vendor/openpam/dist: . lib/libpam t X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Feb 2014 17:06:56 -0000 Author: des Date: Wed Feb 26 17:06:54 2014 New Revision: 262529 URL: http://svnweb.freebsd.org/changeset/base/262529 Log: Merge upstream r763: fix is_upper() predicate. Added: vendor/openpam/dist/t/t_openpam_ctype.c Modified: vendor/openpam/dist/CREDITS vendor/openpam/dist/lib/libpam/openpam_ctype.h vendor/openpam/dist/t/Makefile.am Modified: vendor/openpam/dist/CREDITS ============================================================================== --- vendor/openpam/dist/CREDITS Wed Feb 26 16:09:54 2014 (r262528) +++ vendor/openpam/dist/CREDITS Wed Feb 26 17:06:54 2014 (r262529) @@ -29,9 +29,9 @@ ideas: Hubert Feyrer Jason Evans Joe Marcus Clarke - Juli Mallett - Ankita Pal Jörg Sonnenberger + Juli Mallett + Larry Baird Maëlle Lesage Mark Murray Matthias Drochner Modified: vendor/openpam/dist/lib/libpam/openpam_ctype.h ============================================================================== --- vendor/openpam/dist/lib/libpam/openpam_ctype.h Wed Feb 26 16:09:54 2014 (r262528) +++ vendor/openpam/dist/lib/libpam/openpam_ctype.h Wed Feb 26 17:06:54 2014 (r262529) @@ -39,10 +39,18 @@ (ch >= '0' && ch <= '9') /* + * Evaluates to non-zero if the argument is a hex digit. + */ +#define is_xdigit(ch) \ + ((ch >= '0' && ch <= '9') || \ + (ch >= 'a' && ch <= 'f') || \ + (ch >= 'A' && ch <= 'F')) + +/* * Evaluates to non-zero if the argument is an uppercase letter. */ #define is_upper(ch) \ - (ch >= 'A' && ch <= 'A') + (ch >= 'A' && ch <= 'Z') /* * Evaluates to non-zero if the argument is a lowercase letter. Modified: vendor/openpam/dist/t/Makefile.am ============================================================================== --- vendor/openpam/dist/t/Makefile.am Wed Feb 26 16:09:54 2014 (r262528) +++ vendor/openpam/dist/t/Makefile.am Wed Feb 26 17:06:54 2014 (r262529) @@ -6,6 +6,7 @@ noinst_HEADERS = t.h # tests TESTS = +TESTS += t_openpam_ctype TESTS += t_openpam_readword TESTS += t_openpam_readlinev check_PROGRAMS = $(TESTS) Added: vendor/openpam/dist/t/t_openpam_ctype.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/openpam/dist/t/t_openpam_ctype.c Wed Feb 26 17:06:54 2014 (r262529) @@ -0,0 +1,122 @@ +/*- + * Copyright (c) 2014 Dag-Erling Smørgrav + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $Id$ + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include + +#include "openpam_ctype.h" + +#include "t.h" + +#define OC_DIGIT "0123456789" +#define OC_XDIGIT OC_DIGIT "ABCDEFabcdef" +#define OC_UPPER "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +#define OC_LOWER "abcdefghijklmnopqrstuvwxyz" +#define OC_LETTER OC_UPPER OC_LOWER +#define OC_LWS " \t\f\r" +#define OC_WS OC_LWS "\n" +#define OC_P "!\"#$%&'()*+,-./" OC_DIGIT ":;<=>?@" OC_UPPER "[\\]^_`" OC_LOWER "{|}~" +#define OC_PFCS OC_DIGIT OC_LETTER "._-" + +static const char oc_digit[] = OC_DIGIT; +static const char oc_xdigit[] = OC_XDIGIT; +static const char oc_upper[] = OC_UPPER; +static const char oc_lower[] = OC_LOWER; +static const char oc_letter[] = OC_LETTER; +static const char oc_lws[] = OC_LWS; +static const char oc_ws[] = OC_WS; +static const char oc_p[] = OC_P; +static const char oc_pfcs[] = OC_PFCS; + +#define T_OC(set) \ + T_FUNC(t_oc_##set, "is_" #set) \ + { \ + char crib[256]; \ + unsigned int i, ret; \ + \ + memset(crib, 0, sizeof crib); \ + for (i = 0; oc_##set[i]; ++i) \ + crib[(int)oc_##set[i]] = 1; \ + for (i = ret = 0; i < sizeof crib; ++i) { \ + if (is_##set(i) != crib[i]) { \ + t_verbose("is_%s() incorrect " \ + "for %#02x\n", #set, i); \ + ++ret; \ + } \ + } \ + return (ret == 0); \ + } + +T_OC(digit) +T_OC(xdigit) +T_OC(upper) +T_OC(lower) +T_OC(letter) +T_OC(lws) +T_OC(ws) +T_OC(p) +T_OC(pfcs) + + +/*************************************************************************** + * Boilerplate + */ + +const struct t_test *t_plan[] = { + T(t_oc_digit), + T(t_oc_xdigit), + T(t_oc_upper), + T(t_oc_lower), + T(t_oc_letter), + T(t_oc_lws), + T(t_oc_ws), + T(t_oc_p), + T(t_oc_pfcs), + NULL +}; + +const struct t_test ** +t_prepare(int argc, char *argv[]) +{ + + (void)argc; + (void)argv; + return (t_plan); +} + +void +t_cleanup(void) +{ +}