Remove an unused header and fix some naming nits.

This commit is contained in:
Dag-Erling Smørgrav 2017-03-06 23:39:50 +01:00
parent 9bf06c258c
commit cf46393d5e
3 changed files with 4 additions and 54 deletions

View file

@ -1,6 +1,6 @@
/*-
* Copyright (c) 2012-2014 The University of Oslo
* Copyright (c) 2013-2016 Dag-Erling Smørgrav
* Copyright (c) 2013-2017 Dag-Erling Smørgrav
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -28,8 +28,8 @@
* SUCH DAMAGE.
*/
#ifndef OATH_H_INCLUDED
#define OATH_H_INCLUDED
#ifndef CRYB_OATH_H_INCLUDED
#define CRYB_OATH_H_INCLUDED
#ifndef CRYB_TO
#include <cryb/to.h>

View file

@ -84,7 +84,7 @@ enum oath_hash {
/*
* Label to use for dummy keys
*/
#define OATH_DUMMY_LABEL "oath-dummy@openpam.org"
#define OATH_DUMMY_LABEL "oath-dummy@cryb.to"
CRYB_END

View file

@ -1,50 +0,0 @@
/*-
* Copyright (c) 2012-2013 The University of Oslo
* 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.
*/
#ifndef OATH_IMPL_H_INCLUDED
#define OATH_IMPL_H_INCLUDED
#if _BullseyeCoverage
#define COVERAGE_DISABLE _Pragma("BullseyeCoverage save off")
#define COVERAGE_RESTORE _Pragma("BullseyeCoverage restore")
#else
#define COVERAGE_DISABLE
#define COVERAGE_RESTORE
#endif
/*
* Use at end of switch which has no default case
*/
#define COVERAGE_NO_DEFAULT_CASE \
COVERAGE_DISABLE \
default: \
(void)0; \
COVERAGE_RESTORE
#endif