ksba.h (libksba-1.4.0.tar.bz2) | : | ksba.h (libksba-1.5.0.tar.bz2) | ||
---|---|---|---|---|
/* ksba.h - X.509 library used by GnuPG | /* ksba.h - X.509 library used by GnuPG | |||
* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011 | * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011 | |||
* 2012, 2013, 2104, 2015, 2019 g10 Code GmbH | * 2012, 2013, 2104, 2015, 2019, 2020 g10 Code GmbH | |||
* | * | |||
* This file is part of KSBA. | * This file is part of KSBA. | |||
* | * | |||
* KSBA is free software; you can redistribute it and/or modify | * KSBA is free software; you can redistribute it and/or modify | |||
* it under the terms of either | * it under the terms of either | |||
* | * | |||
* - the GNU Lesser General Public License as published by the Free | * - the GNU Lesser General Public License as published by the Free | |||
* Software Foundation; either version 3 of the License, or (at | * Software Foundation; either version 3 of the License, or (at | |||
* your option) any later version. | * your option) any later version. | |||
* | * | |||
skipping to change at line 30 | skipping to change at line 30 | |||
* or both in parallel, as here. | * or both in parallel, as here. | |||
* | * | |||
* KSBA is distributed in the hope that it will be useful, but WITHOUT | * KSBA is distributed in the hope that it will be useful, but WITHOUT | |||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY | |||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public | * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public | |||
* License for more details. | * License for more details. | |||
* | * | |||
* You should have received a copies of the GNU General Public License | * You should have received a copies of the GNU General Public License | |||
* and the GNU Lesser General Public License along with this program; | * and the GNU Lesser General Public License along with this program; | |||
* if not, see <http://www.gnu.org/licenses/>. | * if not, see <http://www.gnu.org/licenses/>. | |||
* SPDX-License-Identifier: LGPL-3.0-or-later OR GPL-2.0-or-later | ||||
*/ | */ | |||
#ifndef KSBA_H | #ifndef KSBA_H | |||
#define KSBA_H 1 | #define KSBA_H 1 | |||
#include <gpg-error.h> | #include <gpg-error.h> | |||
#include <stdio.h> | #include <stdio.h> | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
extern "C" { | extern "C" { | |||
#if 0 | #if 0 | |||
} | } | |||
#endif | #endif | |||
#endif | #endif | |||
/* The version of this header should match the one of the library. Do | /* The version of this header should match the one of the library. Do | |||
* not use this symbol in your application; use assuan_check_version | * not use this symbol in your application; use assuan_check_version | |||
* instead. */ | * instead. */ | |||
#define KSBA_VERSION "1.4.0" | #define KSBA_VERSION "1.5.0" | |||
/* The version number of this header. It may be used to handle minor | /* The version number of this header. It may be used to handle minor | |||
* API incompatibilities. */ | * API incompatibilities. */ | |||
#define KSBA_VERSION_NUMBER 0x010400 | #define KSBA_VERSION_NUMBER 0x010500 | |||
/* Check for compiler features. */ | /* Check for compiler features. */ | |||
#ifdef __GNUC__ | #ifdef __GNUC__ | |||
#define _KSBA_GCC_VERSION (__GNUC__ * 10000 \ | #define _KSBA_GCC_VERSION (__GNUC__ * 10000 \ | |||
+ __GNUC_MINOR__ * 100 \ | + __GNUC_MINOR__ * 100 \ | |||
+ __GNUC_PATCHLEVEL__) | + __GNUC_PATCHLEVEL__) | |||
#if _KSBA_GCC_VERSION > 30100 | #if _KSBA_GCC_VERSION > 30100 | |||
#define _KSBA_DEPRECATED __attribute__ ((__deprecated__)) | #define _KSBA_DEPRECATED __attribute__ ((__deprecated__)) | |||
#endif | #endif | |||
#endif /*__GNUC__*/ | #endif /*__GNUC__*/ | |||
skipping to change at line 122 | skipping to change at line 123 | |||
typedef enum | typedef enum | |||
{ | { | |||
KSBA_CT_NONE = 0, | KSBA_CT_NONE = 0, | |||
KSBA_CT_DATA = 1, | KSBA_CT_DATA = 1, | |||
KSBA_CT_SIGNED_DATA = 2, | KSBA_CT_SIGNED_DATA = 2, | |||
KSBA_CT_ENVELOPED_DATA = 3, | KSBA_CT_ENVELOPED_DATA = 3, | |||
KSBA_CT_DIGESTED_DATA = 4, | KSBA_CT_DIGESTED_DATA = 4, | |||
KSBA_CT_ENCRYPTED_DATA = 5, | KSBA_CT_ENCRYPTED_DATA = 5, | |||
KSBA_CT_AUTH_DATA = 6, | KSBA_CT_AUTH_DATA = 6, | |||
KSBA_CT_PKCS12 = 7, | KSBA_CT_PKCS12 = 7, | |||
KSBA_CT_SPC_IND_DATA_CTX = 8 | KSBA_CT_SPC_IND_DATA_CTX = 8, | |||
KSBA_CT_OPENPGP_KEYBLOCK = 9 | ||||
} | } | |||
ksba_content_type_t; | ksba_content_type_t; | |||
typedef ksba_content_type_t KsbaContentType _KSBA_DEPRECATED; | typedef ksba_content_type_t KsbaContentType _KSBA_DEPRECATED; | |||
typedef enum | typedef enum | |||
{ | { | |||
KSBA_SR_NONE = 0, /* Never seen by libksba user. */ | KSBA_SR_NONE = 0, /* Never seen by libksba user. */ | |||
KSBA_SR_RUNNING = 1, /* Never seen by libksba user. */ | KSBA_SR_RUNNING = 1, /* Never seen by libksba user. */ | |||
KSBA_SR_GOT_CONTENT = 2, | KSBA_SR_GOT_CONTENT = 2, | |||
KSBA_SR_NEED_HASH = 3, | KSBA_SR_NEED_HASH = 3, | |||
End of changes. 5 change blocks. | ||||
4 lines changed or deleted | 6 lines changed or added |