ABI
Tracker

(GnuTLS)



Headers diff: 3.1.10 vs 3.1.11



 abstract.h (3.1.10)   abstract.h (3.1.11) 
skipping to change at line 39 skipping to change at line 39
#include <gnutls/openpgp.h> #include <gnutls/openpgp.h>
#include <gnutls/tpm.h> #include <gnutls/tpm.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
{ {
#endif #endif
/* Public key operations */ /* Public key operations */
#define GNUTLS_PUBKEY_VERIFY_FLAG_TLS_RSA 1 #define GNUTLS_PUBKEY_VERIFY_FLAG_TLS_RSA GNUTLS_PUBKEY_VERIFY_FLAG_TLS1_RS
/* The following flag disables call to PIN callbacks etc. A
* Only works for TPM keys. /**
* gnutls_pubkey_flags:
* @GNUTLS_PUBKEY_VERIFY_FLAG_TLS1_RSA: This indicates that a (raw) RSA sig
nature is provided
* as in the TLS 1.0 protocol.
* @GNUTLS_PUBKEY_DISABLE_CALLBACKS: The following flag disables call to PI
N callbacks. Only
* relevant to TPM keys.
* @GNUTLS_PUBKEY_GET_OPENPGP_FINGERPRINT: request an OPENPGP fingerprint i
nstead of the default.
*
* Enumeration of different certificate import flags.
*/ */
#define GNUTLS_PUBKEY_DISABLE_CALLBACKS (1<<2) typedef enum gnutls_pubkey_flags
#define GNUTLS_PUBKEY_GET_OPENPGP_FINGERPRINT (1<<3) {
GNUTLS_PUBKEY_VERIFY_FLAG_TLS1_RSA = 1,
GNUTLS_PUBKEY_DISABLE_CALLBACKS = 1<<2,
GNUTLS_PUBKEY_GET_OPENPGP_FINGERPRINT = 1<<3,
} gnutls_pubkey_flags_t;
struct gnutls_pubkey_st; struct gnutls_pubkey_st;
typedef struct gnutls_pubkey_st *gnutls_pubkey_t; typedef struct gnutls_pubkey_st *gnutls_pubkey_t;
struct gnutls_privkey_st; struct gnutls_privkey_st;
typedef struct gnutls_privkey_st *gnutls_privkey_t; typedef struct gnutls_privkey_st *gnutls_privkey_t;
typedef int (*gnutls_privkey_sign_func) (gnutls_privkey_t key, typedef int (*gnutls_privkey_sign_func) (gnutls_privkey_t key,
void *userdata, void *userdata,
const gnutls_datum_t * raw_data, const gnutls_datum_t * raw_data,
skipping to change at line 216 skipping to change at line 227
void gnutls_privkey_deinit (gnutls_privkey_t key); void gnutls_privkey_deinit (gnutls_privkey_t key);
void gnutls_privkey_set_pin_function (gnutls_privkey_t key, void gnutls_privkey_set_pin_function (gnutls_privkey_t key,
gnutls_pin_callback_t fn, void *userd ata); gnutls_pin_callback_t fn, void *userd ata);
int gnutls_privkey_get_pk_algorithm (gnutls_privkey_t key, int gnutls_privkey_get_pk_algorithm (gnutls_privkey_t key,
unsigned int *bits); unsigned int *bits);
gnutls_privkey_type_t gnutls_privkey_get_type (gnutls_privkey_t key); gnutls_privkey_type_t gnutls_privkey_get_type (gnutls_privkey_t key);
int gnutls_privkey_status (gnutls_privkey_t key); int gnutls_privkey_status (gnutls_privkey_t key);
#define GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE (1<<0) /**
#define GNUTLS_PRIVKEY_IMPORT_COPY (1<<1) * gnutls_privkey_flags:
/* The following flag disables call to PIN callbacks etc. * @GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA: Make an RSA signature on the hashed
* Only works for TPM keys. data as in the TLS protocol.
* @GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE: When importing a private key, autom
atically
* release it when the structure it was imported is released.
* @GNUTLS_PRIVKEY_IMPORT_COPY: Copy required values during import.
* @GNUTLS_PRIVKEY_DISABLE_CALLBACKS: The following flag disables call to P
IN callbacks etc.
* Only relevant to TPM keys.
*
* Enumeration of different certificate import flags.
*/ */
#define GNUTLS_PRIVKEY_DISABLE_CALLBACKS (1<<2) typedef enum gnutls_privkey_flags
{
GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE = 1,
GNUTLS_PRIVKEY_IMPORT_COPY = 1<<1,
GNUTLS_PRIVKEY_DISABLE_CALLBACKS = 1<<2,
GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA = 1<<4,
} gnutls_privkey_flags_t;
int gnutls_privkey_import_pkcs11 (gnutls_privkey_t pkey, int gnutls_privkey_import_pkcs11 (gnutls_privkey_t pkey,
gnutls_pkcs11_privkey_t key, gnutls_pkcs11_privkey_t key,
unsigned int flags); unsigned int flags);
int gnutls_privkey_import_x509 (gnutls_privkey_t pkey, int gnutls_privkey_import_x509 (gnutls_privkey_t pkey,
gnutls_x509_privkey_t key, gnutls_x509_privkey_t key,
unsigned int flags); unsigned int flags);
int gnutls_privkey_import_openpgp (gnutls_privkey_t pkey, int gnutls_privkey_import_openpgp (gnutls_privkey_t pkey,
gnutls_openpgp_privkey_t key, gnutls_openpgp_privkey_t key,
unsigned int flags); unsigned int flags);
 End of changes. 4 change blocks. 
10 lines changed or deleted 41 lines changed or added


 gnutls.h (3.1.10)   gnutls.h (3.1.11) 
/* -*- c -*- /* -*- c -*-
* Copyright (C) 2000-2012 Free Software Foundation, Inc. * Copyright (C) 2000-2012 Free Software Foundation, Inc.
* *
* Author: Nikos Mavrogiannopoulos * Author: Nikos Mavrogiannopoulos
* *
* This file is part of GnuTLS. * This file is part of GnuTLS.
* *
* The GnuTLS is free software; you can redistribute it and/or * The GnuTLS is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 3 of * as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version. * the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, but * This library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
* *
skipping to change at line 54 skipping to change at line 54
#include <sys/types.h> #include <sys/types.h>
/* *INDENT-ON* */ /* *INDENT-ON* */
#endif #endif
/* Get time_t. */ /* Get time_t. */
#include <time.h> #include <time.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
{ {
#endif #endif
#define GNUTLS_VERSION "3.1.10" #define GNUTLS_VERSION "3.1.11"
#define GNUTLS_VERSION_MAJOR 3 #define GNUTLS_VERSION_MAJOR 3
#define GNUTLS_VERSION_MINOR 1 #define GNUTLS_VERSION_MINOR 1
#define GNUTLS_VERSION_PATCH 10 #define GNUTLS_VERSION_PATCH 11
#define GNUTLS_VERSION_NUMBER 0x03010a #define GNUTLS_VERSION_NUMBER 0x03010b
#define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC #define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC
#define GNUTLS_CIPHER_RIJNDAEL_256_CBC GNUTLS_CIPHER_AES_256_CBC #define GNUTLS_CIPHER_RIJNDAEL_256_CBC GNUTLS_CIPHER_AES_256_CBC
#define GNUTLS_CIPHER_RIJNDAEL_CBC GNUTLS_CIPHER_AES_128_CBC #define GNUTLS_CIPHER_RIJNDAEL_CBC GNUTLS_CIPHER_AES_128_CBC
#define GNUTLS_CIPHER_ARCFOUR GNUTLS_CIPHER_ARCFOUR_128 #define GNUTLS_CIPHER_ARCFOUR GNUTLS_CIPHER_ARCFOUR_128
/** /**
* gnutls_cipher_algorithm_t: * gnutls_cipher_algorithm_t:
* @GNUTLS_CIPHER_UNKNOWN: Unknown algorithm. * @GNUTLS_CIPHER_UNKNOWN: Unknown algorithm.
* @GNUTLS_CIPHER_NULL: NULL algorithm. * @GNUTLS_CIPHER_NULL: NULL algorithm.
skipping to change at line 809 skipping to change at line 809
/* get information on the current session */ /* get information on the current session */
gnutls_cipher_algorithm_t gnutls_cipher_get (gnutls_session_t session); gnutls_cipher_algorithm_t gnutls_cipher_get (gnutls_session_t session);
gnutls_kx_algorithm_t gnutls_kx_get (gnutls_session_t session); gnutls_kx_algorithm_t gnutls_kx_get (gnutls_session_t session);
gnutls_mac_algorithm_t gnutls_mac_get (gnutls_session_t session); gnutls_mac_algorithm_t gnutls_mac_get (gnutls_session_t session);
gnutls_compression_method_t gnutls_compression_method_t
gnutls_compression_get (gnutls_session_t session); gnutls_compression_get (gnutls_session_t session);
gnutls_certificate_type_t gnutls_certificate_type_t
gnutls_certificate_type_get (gnutls_session_t session); gnutls_certificate_type_get (gnutls_session_t session);
int gnutls_sign_algorithm_get (gnutls_session_t session); int gnutls_sign_algorithm_get (gnutls_session_t session);
int gnutls_sign_algorithm_get_client (gnutls_session_t session);
int gnutls_sign_algorithm_get_requested (gnutls_session_t session, int gnutls_sign_algorithm_get_requested (gnutls_session_t session,
size_t indx, size_t indx,
gnutls_sign_algorithm_t * algo); gnutls_sign_algorithm_t * algo);
size_t gnutls_cipher_get_key_size (gnutls_cipher_algorithm_t algorithm); size_t gnutls_cipher_get_key_size (gnutls_cipher_algorithm_t algorithm);
size_t gnutls_mac_get_key_size (gnutls_mac_algorithm_t algorithm); size_t gnutls_mac_get_key_size (gnutls_mac_algorithm_t algorithm);
/* the name of the specified algorithms */ /* the name of the specified algorithms */
const char *gnutls_cipher_get_name (gnutls_cipher_algorithm_t algorithm); const char *gnutls_cipher_get_name (gnutls_cipher_algorithm_t algorithm);
skipping to change at line 1261 skipping to change at line 1262
int gnutls_certificate_set_x509_crl_mem (gnutls_certificate_credentials_t int gnutls_certificate_set_x509_crl_mem (gnutls_certificate_credentials_t
res, const gnutls_datum_t * CRL, res, const gnutls_datum_t * CRL,
gnutls_x509_crt_fmt_t type); gnutls_x509_crt_fmt_t type);
int int
gnutls_certificate_set_x509_key_file (gnutls_certificate_credentials_t gnutls_certificate_set_x509_key_file (gnutls_certificate_credentials_t
res, const char *certfile, res, const char *certfile,
const char *keyfile, const char *keyfile,
gnutls_x509_crt_fmt_t type); gnutls_x509_crt_fmt_t type);
int
gnutls_certificate_set_x509_key_file2 (gnutls_certificate_credentials_t
res, const char *certfile,
const char *keyfile,
gnutls_x509_crt_fmt_t type,
const char* pass,
unsigned int flags);
int gnutls_certificate_set_x509_key_mem (gnutls_certificate_credentials_t int gnutls_certificate_set_x509_key_mem (gnutls_certificate_credentials_t
res, const gnutls_datum_t * cert , res, const gnutls_datum_t * cert ,
const gnutls_datum_t * key, const gnutls_datum_t * key,
gnutls_x509_crt_fmt_t type); gnutls_x509_crt_fmt_t type);
int gnutls_certificate_set_x509_key_mem2 (gnutls_certificate_credentials_
t
res, const gnutls_datum_t * cert
,
const gnutls_datum_t * key,
gnutls_x509_crt_fmt_t type,
const char* pass,
unsigned int flags);
void gnutls_certificate_send_x509_rdn_sequence (gnutls_session_t session, void gnutls_certificate_send_x509_rdn_sequence (gnutls_session_t session,
int status); int status);
int gnutls_certificate_set_x509_simple_pkcs12_file (gnutls_certificate_cr edentials_t res, const char *pkcs12file, int gnutls_certificate_set_x509_simple_pkcs12_file (gnutls_certificate_cr edentials_t res, const char *pkcs12file,
gnutls_x509_crt_fmt_t type, const char *password); gnutls_x509_crt_fmt_t type, const char *password);
int gnutls_certificate_set_x509_simple_pkcs12_mem (gnutls_certificate_cre dentials_t res, const gnutls_datum_t * p12blob, int gnutls_certificate_set_x509_simple_pkcs12_mem (gnutls_certificate_cre dentials_t res, const gnutls_datum_t * p12blob,
gnutls_x509_crt_fmt_t type, const char *password); gnutls_x509_crt_fmt_t type, const char *password);
/* New functions to allow setting already parsed X.509 stuff. /* New functions to allow setting already parsed X.509 stuff.
*/ */
 End of changes. 7 change blocks. 
4 lines changed or deleted 22 lines changed or added


 ocsp.h (3.1.10)   ocsp.h (3.1.11) 
/* /*
* Copyright (C) 2011-2012 Free Software Foundation, Inc. * Copyright (C) 2011-2012 Free Software Foundation, Inc.
* *
* Author: Simon Josefsson * Author: Simon Josefsson
* *
* This file is part of GnuTLS. * This file is part of GnuTLS.
* *
* The GnuTLS is free software; you can redistribute it and/or * The GnuTLS is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 3 of * as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version. * the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, but * This library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
* *
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 x509.h (3.1.10)   x509.h (3.1.11) 
/* /*
* Copyright (C) 2003-2012 Free Software Foundation, Inc. * Copyright (C) 2003-2012 Free Software Foundation, Inc.
* *
* Author: Nikos Mavrogiannopoulos * Author: Nikos Mavrogiannopoulos
* *
* This file is part of GnuTLS. * This file is part of GnuTLS.
* *
* The GnuTLS is free software; you can redistribute it and/or * The GnuTLS is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 3 of * as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version. * the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, but * This library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
* *
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41.The latest version is available from http://tools.ietf.org/tools/rfcdiff/