From 4615f5ecf96ef4637d814a4dfeab9c404b4a3667 Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin.krahl@ireas.org>
Date: Mon, 10 Dec 2018 12:42:48 +0000
Subject: Update to libnitrokey v3.4

Besides the changes listed in the changelog, this patch also changes the
build system to be able to generate the version.cc file containing the
library version.
---
 libnitrokey-v3.3/libnitrokey/LibraryException.h | 118 ------------------------
 1 file changed, 118 deletions(-)
 delete mode 100644 libnitrokey-v3.3/libnitrokey/LibraryException.h

(limited to 'libnitrokey-v3.3/libnitrokey/LibraryException.h')

diff --git a/libnitrokey-v3.3/libnitrokey/LibraryException.h b/libnitrokey-v3.3/libnitrokey/LibraryException.h
deleted file mode 100644
index 3b9d177..0000000
--- a/libnitrokey-v3.3/libnitrokey/LibraryException.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2015-2018 Nitrokey UG
- *
- * This file is part of libnitrokey.
- *
- * libnitrokey is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * libnitrokey is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with libnitrokey. If not, see <http://www.gnu.org/licenses/>.
- *
- * SPDX-License-Identifier: LGPL-3.0
- */
-
-#ifndef LIBNITROKEY_LIBRARYEXCEPTION_H
-#define LIBNITROKEY_LIBRARYEXCEPTION_H
-
-#include <exception>
-#include <cstdint>
-#include <string>
-#include "log.h"
-
-class LibraryException: std::exception {
-public:
-    virtual uint8_t exception_id()= 0;
-};
-
-class TargetBufferSmallerThanSource: public LibraryException {
-public:
-    virtual uint8_t exception_id() override {
-        return 203;
-    }
-
-public:
-    size_t source_size;
-    size_t target_size;
-
-    TargetBufferSmallerThanSource(
-            size_t source_size, size_t target_size
-            ) : source_size(source_size),  target_size(target_size) {}
-
-    virtual const char *what() const throw() override {
-        std::string s = " ";
-        auto ts = [](size_t x){ return std::to_string(x); };
-        std::string msg = std::string("Target buffer size is smaller than source: [source size, buffer size]")
-            +s+ ts(source_size) +s+ ts(target_size);
-        return msg.c_str();
-    }
-
-};
-
-class InvalidHexString : public LibraryException {
-public:
-    virtual uint8_t exception_id() override {
-        return 202;
-    }
-
-public:
-    uint8_t invalid_char;
-
-    InvalidHexString (uint8_t invalid_char) : invalid_char( invalid_char) {}
-
-    virtual const char *what() const throw() override {
-        return "Invalid character in hex string";
-    }
-
-};
-
-class InvalidSlotException : public LibraryException {
-public:
-    virtual uint8_t exception_id() override {
-        return 201;
-    }
-
-public:
-    uint8_t slot_selected;
-
-    InvalidSlotException(uint8_t slot_selected) : slot_selected(slot_selected) {}
-
-    virtual const char *what() const throw() override {
-        return "Wrong slot selected";
-    }
-
-};
-
-
-
-class TooLongStringException : public LibraryException {
-public:
-    virtual uint8_t exception_id() override {
-        return 200;
-    }
-
-    std::size_t size_source;
-    std::size_t size_destination;
-    std::string message;
-
-    TooLongStringException(size_t size_source, size_t size_destination, const std::string &message = "") : size_source(
-            size_source), size_destination(size_destination), message(message) {
-      LOG(std::string("TooLongStringException, size diff: ")+ std::to_string(size_source-size_destination), nitrokey::log::Loglevel::DEBUG);
-
-    }
-
-    virtual const char *what() const throw() override {
-        //TODO add sizes and message data to final message
-        return "Too long string has been supplied as an argument";
-    }
-
-};
-
-#endif //LIBNITROKEY_LIBRARYEXCEPTION_H
-- 
cgit v1.2.1