2011-07-20 18:04:18 +00:00
|
|
|
/*
|
2012-01-30 17:44:13 +00:00
|
|
|
* Copyright (C) 2011-2012 Red Hat, Inc.
|
2011-07-20 18:04:18 +00:00
|
|
|
*
|
|
|
|
* This library 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 2.1 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library 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
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
2012-09-20 22:30:55 +00:00
|
|
|
* License along with this library. If not, see
|
2012-07-21 10:06:23 +00:00
|
|
|
* <http://www.gnu.org/licenses/>.
|
2011-07-20 18:04:18 +00:00
|
|
|
*
|
|
|
|
* Author: Daniel P. Berrange <berrange@redhat.com>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <sys/socket.h>
|
2011-08-03 16:23:21 +00:00
|
|
|
#include <gnutls/gnutls.h>
|
|
|
|
#include <gnutls/x509.h>
|
2011-07-20 18:04:18 +00:00
|
|
|
|
|
|
|
#include "testutils.h"
|
|
|
|
#include "util.h"
|
|
|
|
#include "virterror_internal.h"
|
|
|
|
#include "memory.h"
|
|
|
|
#include "logging.h"
|
|
|
|
#include "virfile.h"
|
|
|
|
#include "command.h"
|
Split src/util/network.{c,h} into 5 pieces
The src/util/network.c file is a dumping ground for many different
APIs. Split it up into 5 pieces, along functional lines
- src/util/virnetdevbandwidth.c: virNetDevBandwidth type & helper APIs
- src/util/virnetdevvportprofile.c: virNetDevVPortProfile type & helper APIs
- src/util/virsocketaddr.c: virSocketAddr and APIs
- src/conf/netdev_bandwidth_conf.c: XML parsing / formatting
for virNetDevBandwidth
- src/conf/netdev_vport_profile_conf.c: XML parsing / formatting
for virNetDevVPortProfile
* src/util/network.c, src/util/network.h: Split into 5 pieces
* src/conf/netdev_bandwidth_conf.c, src/conf/netdev_bandwidth_conf.h,
src/conf/netdev_vport_profile_conf.c, src/conf/netdev_vport_profile_conf.h,
src/util/virnetdevbandwidth.c, src/util/virnetdevbandwidth.h,
src/util/virnetdevvportprofile.c, src/util/virnetdevvportprofile.h,
src/util/virsocketaddr.c, src/util/virsocketaddr.h: New pieces
* daemon/libvirtd.h, daemon/remote.c, src/conf/domain_conf.c,
src/conf/domain_conf.h, src/conf/network_conf.c,
src/conf/network_conf.h, src/conf/nwfilter_conf.h,
src/esx/esx_util.h, src/network/bridge_driver.c,
src/qemu/qemu_conf.c, src/rpc/virnetsocket.c,
src/rpc/virnetsocket.h, src/util/dnsmasq.h, src/util/interface.h,
src/util/iptables.h, src/util/macvtap.c, src/util/macvtap.h,
src/util/virnetdev.h, src/util/virnetdevtap.c,
tools/virsh.c: Update include files
2011-11-02 15:40:08 +00:00
|
|
|
#include "virsocketaddr.h"
|
2011-08-03 16:23:21 +00:00
|
|
|
#include "gnutls_1_0_compat.h"
|
2011-07-20 18:04:18 +00:00
|
|
|
|
2012-01-30 17:44:13 +00:00
|
|
|
#if !defined WIN32 && HAVE_LIBTASN1_H && LIBGNUTLS_VERSION_NUMBER >= 0x020600
|
2011-07-20 18:04:18 +00:00
|
|
|
# include <libtasn1.h>
|
|
|
|
|
|
|
|
# include "rpc/virnettlscontext.h"
|
|
|
|
|
|
|
|
# define VIR_FROM_THIS VIR_FROM_RPC
|
|
|
|
|
|
|
|
const char *keyfile = abs_builddir "/virnettlscontexttest-key.pem";
|
|
|
|
|
|
|
|
/*
|
|
|
|
* These store some static data that is needed when
|
|
|
|
* encoding extensions in the x509 certs
|
|
|
|
*/
|
|
|
|
ASN1_TYPE pkix_asn1;
|
|
|
|
extern const ASN1_ARRAY_TYPE pkix_asn1_tab[];
|
|
|
|
|
|
|
|
/*
|
|
|
|
* To avoid consuming random entropy to generate keys,
|
|
|
|
* here's one we prepared earlier :-)
|
|
|
|
*/
|
|
|
|
gnutls_x509_privkey_t privkey;
|
2011-07-25 17:18:42 +00:00
|
|
|
# define PRIVATE_KEY \
|
|
|
|
"-----BEGIN PRIVATE KEY-----\n" \
|
|
|
|
"MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBALVcr\n" \
|
|
|
|
"BL40Tm6yq88FBhJNw1aaoCjmtg0l4dWQZ/e9Fimx4ARxFpT+ji4FE\n" \
|
|
|
|
"Cgl9s/SGqC+1nvlkm9ViSo0j7MKDbnDB+VRHDvMAzQhA2X7e8M0n9\n" \
|
|
|
|
"rPolUY2lIVC83q0BBaOBkCj2RSmT2xTEbbC2xLukSrg2WP/ihVOxc\n" \
|
|
|
|
"kXRuyFtzAgMBAAECgYB7slBexDwXrtItAMIH6m/U+LUpNe0Xx48OL\n" \
|
|
|
|
"IOn4a4whNgO/o84uIwygUK27ZGFZT0kAGAk8CdF9hA6ArcbQ62s1H\n" \
|
|
|
|
"myxrUbF9/mrLsQw1NEqpuUk9Ay2Tx5U/wPx35S3W/X2AvR/ZpTnCn\n" \
|
|
|
|
"2q/7ym9fyiSoj86drD7BTvmKXlOnOwQJBAPOFMp4mMa9NGpGuEssO\n" \
|
|
|
|
"m3Uwbp6lhcP0cA9MK+iOmeANpoKWfBdk5O34VbmeXnGYWEkrnX+9J\n" \
|
|
|
|
"bM4wVhnnBWtgBMCQQC+qAEmvwcfhauERKYznMVUVksyeuhxhCe7EK\n" \
|
|
|
|
"mPh+U2+g0WwdKvGDgO0PPt1gq0ILEjspMDeMHVdTwkaVBo/uMhAkA\n" \
|
|
|
|
"Z5SsZyCP2aTOPFDypXRdI4eqRcjaEPOUBq27r3uYb/jeboVb2weLa\n" \
|
|
|
|
"L1MmVuHiIHoa5clswPdWVI2y0em2IGoDAkBPSp/v9VKJEZabk9Frd\n" \
|
|
|
|
"a+7u4fanrM9QrEjY3KhduslSilXZZSxrWjjAJPyPiqFb3M8XXA26W\n" \
|
|
|
|
"nz1KYGnqYKhLcBAkB7dt57n9xfrhDpuyVEv+Uv1D3VVAhZlsaZ5Pp\n" \
|
|
|
|
"dcrhrkJn2sa/+O8OKvdrPSeeu/N5WwYhJf61+CPoenMp7IFci\n" \
|
2011-07-20 18:04:18 +00:00
|
|
|
"-----END PRIVATE KEY-----\n"
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This contains parameter about how to generate
|
|
|
|
* certificates.
|
|
|
|
*/
|
|
|
|
struct testTLSCertReq {
|
|
|
|
gnutls_x509_crt_t crt;
|
|
|
|
gnutls_x509_crt_t cacrt; /* If not set, then the cert will be self-signed */
|
|
|
|
|
|
|
|
const char *filename;
|
|
|
|
|
|
|
|
/* Identifying information */
|
|
|
|
const char *country;
|
|
|
|
const char *cn;
|
|
|
|
const char *altname1;
|
|
|
|
const char *altname2;
|
|
|
|
const char *ipaddr1;
|
|
|
|
const char *ipaddr2;
|
|
|
|
|
|
|
|
/* Basic constraints */
|
|
|
|
bool basicConstraintsEnable;
|
|
|
|
bool basicConstraintsCritical;
|
|
|
|
bool basicConstraintsIsCA;
|
|
|
|
|
|
|
|
/* Key usage */
|
|
|
|
bool keyUsageEnable;
|
|
|
|
bool keyUsageCritical;
|
|
|
|
int keyUsageValue;
|
|
|
|
|
|
|
|
/* Key purpose (aka Extended key usage) */
|
|
|
|
bool keyPurposeEnable;
|
|
|
|
bool keyPurposeCritical;
|
|
|
|
const char *keyPurposeOID1;
|
|
|
|
const char *keyPurposeOID2;
|
|
|
|
|
2011-07-22 17:59:37 +00:00
|
|
|
/* zero for current time, or non-zero for hours from now */
|
|
|
|
int start_offset;
|
|
|
|
/* zero for 24 hours from now, or non-zero for hours from now */
|
|
|
|
int expire_offset;
|
2011-07-20 18:04:18 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Turns an ASN1 object into a DER encoded byte array
|
|
|
|
*/
|
|
|
|
static void testTLSDerEncode(ASN1_TYPE src,
|
|
|
|
const char *src_name,
|
|
|
|
gnutls_datum_t * res)
|
|
|
|
{
|
|
|
|
int size;
|
|
|
|
char *data = NULL;
|
|
|
|
|
|
|
|
size = 0;
|
|
|
|
asn1_der_coding(src, src_name, NULL, &size, NULL);
|
|
|
|
|
|
|
|
if (VIR_ALLOC_N(data, size) < 0)
|
|
|
|
abort();
|
|
|
|
|
|
|
|
asn1_der_coding(src, src_name, data, &size, NULL);
|
|
|
|
|
|
|
|
res->data = (unsigned char *)data;
|
|
|
|
res->size = size;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This is a fairly lame x509 certificate generator.
|
|
|
|
*
|
|
|
|
* Do not copy/use this code for generating real certificates
|
|
|
|
* since it leaves out many things that you would want in
|
|
|
|
* certificates for real world usage.
|
|
|
|
*
|
|
|
|
* This is good enough only for doing tests of the libvirt
|
|
|
|
* TLS certificate code
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
testTLSGenerateCert(struct testTLSCertReq *req)
|
|
|
|
{
|
|
|
|
gnutls_x509_crt_t crt;
|
|
|
|
int err;
|
|
|
|
static char buffer[1024*1024];
|
|
|
|
size_t size = sizeof(buffer);
|
|
|
|
char serial[5] = { 1, 2, 3, 4, 0 };
|
|
|
|
gnutls_datum_t der = { (unsigned char *)buffer, size };
|
2011-07-22 17:59:37 +00:00
|
|
|
time_t start = time(NULL) + (60*60*req->start_offset);
|
|
|
|
time_t expire = time(NULL) + (60*60*(req->expire_offset
|
|
|
|
? req->expire_offset : 24));
|
2011-07-20 18:04:18 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Prepare our new certificate object
|
|
|
|
*/
|
|
|
|
if ((err = gnutls_x509_crt_init(&crt)) < 0) {
|
|
|
|
VIR_WARN("Failed to initialize certificate %s", gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
if ((err = gnutls_x509_crt_set_key(crt, privkey)) < 0) {
|
|
|
|
VIR_WARN("Failed to set certificate key %s", gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* A v3 certificate is required in order to be able
|
|
|
|
* set any of the basic constraints, key purpose and
|
|
|
|
* key usage data
|
|
|
|
*/
|
|
|
|
gnutls_x509_crt_set_version(crt, 3);
|
|
|
|
|
|
|
|
if (req->country) {
|
|
|
|
if ((err = gnutls_x509_crt_set_dn_by_oid(crt, GNUTLS_OID_X520_COUNTRY_NAME, 0,
|
|
|
|
req->country, strlen(req->country))) < 0) {
|
|
|
|
VIR_WARN("Failed to set certificate country name %s", gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (req->cn) {
|
|
|
|
if ((err = gnutls_x509_crt_set_dn_by_oid(crt, GNUTLS_OID_X520_COMMON_NAME, 0,
|
|
|
|
req->cn, strlen(req->cn))) < 0) {
|
|
|
|
VIR_WARN("Failed to set certificate common name %s", gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Setup the subject altnames, which are used
|
|
|
|
* for hostname checks in live sessions
|
|
|
|
*/
|
|
|
|
if (req->altname1) {
|
|
|
|
if ((err = gnutls_x509_crt_set_subject_alt_name(crt, GNUTLS_SAN_DNSNAME,
|
|
|
|
req->altname1,
|
|
|
|
strlen(req->altname1),
|
|
|
|
GNUTLS_FSAN_APPEND))) {
|
|
|
|
VIR_WARN("Failed to set certificate alt name %s", gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (req->altname2) {
|
|
|
|
if ((err = gnutls_x509_crt_set_subject_alt_name(crt, GNUTLS_SAN_DNSNAME,
|
|
|
|
req->altname2,
|
|
|
|
strlen(req->altname2),
|
|
|
|
GNUTLS_FSAN_APPEND))) {
|
|
|
|
VIR_WARN("Failed to set certificate %s alt name", gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* IP address need to be put into the cert in their
|
|
|
|
* raw byte form, not strings, hence this is a little
|
|
|
|
* more complicated
|
|
|
|
*/
|
|
|
|
if (req->ipaddr1) {
|
|
|
|
virSocketAddr addr;
|
|
|
|
char *data;
|
|
|
|
int len;
|
Santize naming of socket address APIs
The socket address APIs in src/util/network.h either take the
form virSocketAddrXXX, virSocketXXX or virSocketXXXAddr.
Sanitize this so everything is virSocketAddrXXXX, and ensure
that the virSocketAddr parameter is always the first one.
* src/util/network.c, src/util/network.h: Santize socket
address API naming
* src/conf/domain_conf.c, src/conf/network_conf.c,
src/conf/nwfilter_conf.c, src/network/bridge_driver.c,
src/nwfilter/nwfilter_ebiptables_driver.c,
src/nwfilter/nwfilter_learnipaddr.c,
src/qemu/qemu_command.c, src/rpc/virnetsocket.c,
src/util/dnsmasq.c, src/util/iptables.c,
src/util/virnetdev.c, src/vbox/vbox_tmpl.c: Update for
API renaming
2011-11-02 14:06:59 +00:00
|
|
|
if (virSocketAddrParse(&addr, req->ipaddr1, 0) < 0) {
|
2011-07-20 18:04:18 +00:00
|
|
|
VIR_WARN("Cannot parse %s", req->ipaddr1);
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (addr.data.sa.sa_family == AF_INET) {
|
|
|
|
data = (char*)&addr.data.inet4.sin_addr;
|
|
|
|
len = 4;
|
|
|
|
} else {
|
|
|
|
data = (char*)&addr.data.inet6.sin6_addr;
|
|
|
|
len = 16;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((err = gnutls_x509_crt_set_subject_alt_name(crt, GNUTLS_SAN_IPADDRESS,
|
|
|
|
data, len, GNUTLS_FSAN_APPEND))) {
|
|
|
|
VIR_WARN("Failed to set certificate alt name %s", gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (req->ipaddr2) {
|
|
|
|
virSocketAddr addr;
|
|
|
|
char *data;
|
|
|
|
int len;
|
Santize naming of socket address APIs
The socket address APIs in src/util/network.h either take the
form virSocketAddrXXX, virSocketXXX or virSocketXXXAddr.
Sanitize this so everything is virSocketAddrXXXX, and ensure
that the virSocketAddr parameter is always the first one.
* src/util/network.c, src/util/network.h: Santize socket
address API naming
* src/conf/domain_conf.c, src/conf/network_conf.c,
src/conf/nwfilter_conf.c, src/network/bridge_driver.c,
src/nwfilter/nwfilter_ebiptables_driver.c,
src/nwfilter/nwfilter_learnipaddr.c,
src/qemu/qemu_command.c, src/rpc/virnetsocket.c,
src/util/dnsmasq.c, src/util/iptables.c,
src/util/virnetdev.c, src/vbox/vbox_tmpl.c: Update for
API renaming
2011-11-02 14:06:59 +00:00
|
|
|
if (virSocketAddrParse(&addr, req->ipaddr2, 0) < 0) {
|
2011-07-20 18:04:18 +00:00
|
|
|
VIR_WARN("Cannot parse %s", req->ipaddr2);
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (addr.data.sa.sa_family == AF_INET) {
|
|
|
|
data = (char*)&addr.data.inet4.sin_addr;
|
|
|
|
len = 4;
|
|
|
|
} else {
|
|
|
|
data = (char*)&addr.data.inet6.sin6_addr;
|
|
|
|
len = 16;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((err = gnutls_x509_crt_set_subject_alt_name(crt, GNUTLS_SAN_IPADDRESS,
|
|
|
|
data, len, GNUTLS_FSAN_APPEND))) {
|
|
|
|
VIR_WARN("Failed to set certificate alt name %s", gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Basic constraints are used to decide if the cert
|
|
|
|
* is for a CA or not. We can't use the convenient
|
|
|
|
* gnutls API for setting this, since it hardcodes
|
|
|
|
* the 'critical' field which we want control over
|
|
|
|
*/
|
|
|
|
if (req->basicConstraintsEnable) {
|
|
|
|
ASN1_TYPE ext = ASN1_TYPE_EMPTY;
|
|
|
|
|
|
|
|
asn1_create_element(pkix_asn1, "PKIX1.BasicConstraints", &ext);
|
|
|
|
asn1_write_value(ext, "cA", req->basicConstraintsIsCA ? "TRUE" : "FALSE", 1);
|
|
|
|
asn1_write_value(ext, "pathLenConstraint", NULL, 0);
|
|
|
|
testTLSDerEncode(ext, "", &der);
|
|
|
|
if ((err = gnutls_x509_crt_set_extension_by_oid(crt,
|
|
|
|
"2.5.29.19",
|
|
|
|
der.data,
|
|
|
|
der.size,
|
|
|
|
req->basicConstraintsCritical)) < 0) {
|
|
|
|
VIR_WARN("Failed to set certificate basic constraints %s", gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
asn1_delete_structure(&ext);
|
|
|
|
VIR_FREE(der.data);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Next up the key usage extension. Again we can't
|
|
|
|
* use the gnutls API since it hardcodes the extension
|
|
|
|
* to be 'critical'
|
|
|
|
*/
|
|
|
|
if (req->keyUsageEnable) {
|
|
|
|
ASN1_TYPE ext = ASN1_TYPE_EMPTY;
|
|
|
|
char str[2];
|
|
|
|
|
|
|
|
str[0] = req->keyUsageValue & 0xff;
|
|
|
|
str[1] = (req->keyUsageValue >> 8) & 0xff;
|
|
|
|
|
|
|
|
asn1_create_element(pkix_asn1, "PKIX1.KeyUsage", &ext);
|
|
|
|
asn1_write_value(ext, "", str, 9);
|
|
|
|
testTLSDerEncode(ext, "", &der);
|
|
|
|
if ((err = gnutls_x509_crt_set_extension_by_oid(crt,
|
|
|
|
"2.5.29.15",
|
|
|
|
der.data,
|
|
|
|
der.size,
|
|
|
|
req->keyUsageCritical)) < 0) {
|
|
|
|
VIR_WARN("Failed to set certificate key usage %s", gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
asn1_delete_structure(&ext);
|
|
|
|
VIR_FREE(der.data);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Finally the key purpose extension. This time
|
|
|
|
* gnutls has the opposite problem, always hardcoding
|
|
|
|
* it to be non-critical. So once again we have to
|
|
|
|
* set this the hard way building up ASN1 data ourselves
|
|
|
|
*/
|
|
|
|
if (req->keyPurposeEnable) {
|
|
|
|
ASN1_TYPE ext = ASN1_TYPE_EMPTY;
|
|
|
|
|
|
|
|
asn1_create_element(pkix_asn1, "PKIX1.ExtKeyUsageSyntax", &ext);
|
|
|
|
if (req->keyPurposeOID1) {
|
|
|
|
asn1_write_value(ext, "", "NEW", 1);
|
|
|
|
asn1_write_value(ext, "?LAST", req->keyPurposeOID1, 1);
|
|
|
|
}
|
|
|
|
if (req->keyPurposeOID2) {
|
|
|
|
asn1_write_value(ext, "", "NEW", 1);
|
|
|
|
asn1_write_value(ext, "?LAST", req->keyPurposeOID2, 1);
|
|
|
|
}
|
|
|
|
testTLSDerEncode(ext, "", &der);
|
|
|
|
if ((err = gnutls_x509_crt_set_extension_by_oid(crt,
|
|
|
|
"2.5.29.37",
|
|
|
|
der.data,
|
|
|
|
der.size,
|
|
|
|
req->keyPurposeCritical)) < 0) {
|
|
|
|
VIR_WARN("Failed to set certificate key purpose %s", gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
asn1_delete_structure(&ext);
|
|
|
|
VIR_FREE(der.data);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Any old serial number will do, so lets pick 5
|
|
|
|
*/
|
|
|
|
if ((err = gnutls_x509_crt_set_serial(crt, serial, 5)) < 0) {
|
|
|
|
VIR_WARN("Failed to set certificate serial %s", gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((err = gnutls_x509_crt_set_activation_time(crt, start)) < 0) {
|
|
|
|
VIR_WARN("Failed to set certificate activation %s", gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
if ((err = gnutls_x509_crt_set_expiration_time(crt, expire)) < 0) {
|
|
|
|
VIR_WARN("Failed to set certificate expiration %s", gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If no 'cart' is set then we are self signing
|
|
|
|
* the cert. This is done for CA certs
|
|
|
|
*/
|
|
|
|
if ((err = gnutls_x509_crt_sign(crt, req->cacrt ? req->cacrt : crt, privkey) < 0)) {
|
|
|
|
VIR_WARN("Failed to sign certificate %s", gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Finally write the new cert out to disk
|
|
|
|
*/
|
|
|
|
if ((err = gnutls_x509_crt_export(crt, GNUTLS_X509_FMT_PEM, buffer, &size) < 0)) {
|
|
|
|
VIR_WARN("Failed to export certificate %s", gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (virFileWriteStr(req->filename, buffer, 0600) < 0) {
|
|
|
|
VIR_WARN("Failed to write certificate %s %s", req->filename, gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
|
|
|
|
req->crt = crt;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This loads the private key we defined earlier
|
|
|
|
*/
|
|
|
|
static gnutls_x509_privkey_t testTLSLoadKey(void)
|
|
|
|
{
|
|
|
|
gnutls_x509_privkey_t key;
|
|
|
|
const gnutls_datum_t data = { (unsigned char *)PRIVATE_KEY, strlen(PRIVATE_KEY) };
|
2011-07-22 20:10:39 +00:00
|
|
|
int err;
|
2011-07-20 18:04:18 +00:00
|
|
|
|
2011-07-22 20:10:39 +00:00
|
|
|
if ((err = gnutls_x509_privkey_init(&key)) < 0) {
|
|
|
|
VIR_WARN("Failed to init key %s", gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
2011-07-20 18:04:18 +00:00
|
|
|
|
2011-07-22 20:10:39 +00:00
|
|
|
if ((err = gnutls_x509_privkey_import(key, &data,
|
|
|
|
GNUTLS_X509_FMT_PEM)) < 0) {
|
2011-07-25 17:18:42 +00:00
|
|
|
if (err != GNUTLS_E_BASE64_UNEXPECTED_HEADER_ERROR) {
|
|
|
|
VIR_WARN("Failed to import key %s", gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((err = gnutls_x509_privkey_import_pkcs8(key, &data, GNUTLS_X509_FMT_PEM, NULL, 0)) < 0) {
|
|
|
|
VIR_WARN("Failed to import PKCS8 key %s", gnutls_strerror(err));
|
|
|
|
abort();
|
|
|
|
}
|
2011-07-22 20:10:39 +00:00
|
|
|
}
|
2011-07-20 18:04:18 +00:00
|
|
|
|
|
|
|
return key;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
struct testTLSContextData {
|
|
|
|
bool isServer;
|
|
|
|
struct testTLSCertReq careq;
|
|
|
|
struct testTLSCertReq certreq;
|
|
|
|
bool expectFail;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This tests sanity checking of our own certificates
|
|
|
|
*
|
|
|
|
* This code is done when libvirtd starts up, or before
|
|
|
|
* a libvirt client connects. The test is ensuring that
|
|
|
|
* the creation of virNetTLSContextPtr fails if we
|
|
|
|
* give bogus certs, or suceeds for good certs
|
|
|
|
*/
|
|
|
|
static int testTLSContextInit(const void *opaque)
|
|
|
|
{
|
|
|
|
struct testTLSContextData *data = (struct testTLSContextData *)opaque;
|
|
|
|
virNetTLSContextPtr ctxt = NULL;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
testTLSGenerateCert(&data->careq);
|
|
|
|
data->certreq.cacrt = data->careq.crt;
|
|
|
|
testTLSGenerateCert(&data->certreq);
|
|
|
|
|
|
|
|
if (data->isServer) {
|
|
|
|
ctxt = virNetTLSContextNewServer(data->careq.filename,
|
|
|
|
NULL,
|
|
|
|
data->certreq.filename,
|
|
|
|
keyfile,
|
|
|
|
NULL,
|
|
|
|
true,
|
|
|
|
true);
|
|
|
|
} else {
|
|
|
|
ctxt = virNetTLSContextNewClient(data->careq.filename,
|
|
|
|
NULL,
|
|
|
|
data->certreq.filename,
|
|
|
|
keyfile,
|
|
|
|
true,
|
|
|
|
true);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ctxt) {
|
|
|
|
if (data->expectFail) {
|
|
|
|
VIR_WARN("Expected failure %s against %s",
|
|
|
|
data->careq.filename, data->certreq.filename);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
virErrorPtr err = virGetLastError();
|
|
|
|
if (!data->expectFail) {
|
|
|
|
VIR_WARN("Unexpected failure %s against %s",
|
|
|
|
data->careq.filename, data->certreq.filename);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
VIR_DEBUG("Got error %s", err ? err->message : "<unknown>");
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
cleanup:
|
2012-07-11 13:35:48 +00:00
|
|
|
virObjectUnref(ctxt);
|
2011-07-20 18:04:18 +00:00
|
|
|
gnutls_x509_crt_deinit(data->careq.crt);
|
|
|
|
gnutls_x509_crt_deinit(data->certreq.crt);
|
|
|
|
data->careq.crt = data->certreq.crt = NULL;
|
|
|
|
/* When troubleshooting this tests, we often want to leave the certs on disk */
|
|
|
|
if (getenv("VIRT_TEST_DEBUG_CERTS") == NULL) {
|
|
|
|
unlink(data->careq.filename);
|
|
|
|
unlink(data->certreq.filename);
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
struct testTLSSessionData {
|
|
|
|
struct testTLSCertReq careq;
|
|
|
|
struct testTLSCertReq othercareq;
|
|
|
|
struct testTLSCertReq serverreq;
|
|
|
|
struct testTLSCertReq clientreq;
|
|
|
|
bool expectServerFail;
|
|
|
|
bool expectClientFail;
|
|
|
|
const char *hostname;
|
|
|
|
const char *const* wildcards;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static ssize_t testWrite(const char *buf, size_t len, void *opaque)
|
|
|
|
{
|
|
|
|
int *fd = opaque;
|
|
|
|
|
|
|
|
return write(*fd, buf, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t testRead(char *buf, size_t len, void *opaque)
|
|
|
|
{
|
|
|
|
int *fd = opaque;
|
|
|
|
|
|
|
|
return read(*fd, buf, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This tests validation checking of peer certificates
|
|
|
|
*
|
|
|
|
* This is replicating the checks that are done for an
|
|
|
|
* active TLS session after handshake completes. To
|
|
|
|
* simulate that we create our TLS contexts, skipping
|
|
|
|
* sanity checks. When then get a socketpair, and
|
|
|
|
* initiate a TLS session across them. Finally do
|
|
|
|
* do actual cert validation tests
|
|
|
|
*/
|
|
|
|
static int testTLSSessionInit(const void *opaque)
|
|
|
|
{
|
|
|
|
struct testTLSSessionData *data = (struct testTLSSessionData *)opaque;
|
|
|
|
virNetTLSContextPtr clientCtxt = NULL;
|
|
|
|
virNetTLSContextPtr serverCtxt = NULL;
|
|
|
|
virNetTLSSessionPtr clientSess = NULL;
|
|
|
|
virNetTLSSessionPtr serverSess = NULL;
|
|
|
|
int ret = -1;
|
|
|
|
int channel[2];
|
|
|
|
bool clientShake = false;
|
|
|
|
bool serverShake = false;
|
|
|
|
|
|
|
|
|
|
|
|
/* We'll use this for our fake client-server connection */
|
|
|
|
if (socketpair(AF_UNIX, SOCK_STREAM, 0, channel) < 0)
|
|
|
|
abort();
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We have an evil loop to do the handshake in a single
|
|
|
|
* thread, so we need these non-blocking to avoid deadlock
|
|
|
|
* of ourselves
|
|
|
|
*/
|
|
|
|
ignore_value(virSetNonBlock(channel[0]));
|
|
|
|
ignore_value(virSetNonBlock(channel[1]));
|
|
|
|
|
|
|
|
|
|
|
|
/* Generate all the certs we need for this test */
|
|
|
|
testTLSGenerateCert(&data->careq);
|
|
|
|
data->serverreq.cacrt = data->careq.crt;
|
|
|
|
testTLSGenerateCert(&data->serverreq);
|
|
|
|
|
|
|
|
if (data->othercareq.filename) {
|
|
|
|
testTLSGenerateCert(&data->othercareq);
|
|
|
|
data->clientreq.cacrt = data->othercareq.crt;
|
|
|
|
} else {
|
|
|
|
data->clientreq.cacrt = data->careq.crt;
|
|
|
|
}
|
|
|
|
testTLSGenerateCert(&data->clientreq);
|
|
|
|
|
|
|
|
|
|
|
|
/* We skip initial sanity checks here because we
|
|
|
|
* want to make sure that problems are being
|
|
|
|
* detected at the TLS session validation stage
|
|
|
|
*/
|
|
|
|
serverCtxt = virNetTLSContextNewServer(data->careq.filename,
|
|
|
|
NULL,
|
|
|
|
data->serverreq.filename,
|
|
|
|
keyfile,
|
|
|
|
data->wildcards,
|
|
|
|
false,
|
|
|
|
true);
|
|
|
|
|
|
|
|
clientCtxt = virNetTLSContextNewClient(data->othercareq.filename ?
|
|
|
|
data->othercareq.filename :
|
|
|
|
data->careq.filename,
|
|
|
|
NULL,
|
|
|
|
data->clientreq.filename,
|
|
|
|
keyfile,
|
|
|
|
false,
|
|
|
|
true);
|
|
|
|
|
|
|
|
if (!serverCtxt) {
|
|
|
|
VIR_WARN("Unexpected failure loading %s against %s",
|
|
|
|
data->careq.filename, data->serverreq.filename);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
if (!clientCtxt) {
|
|
|
|
VIR_WARN("Unexpected failure loading %s against %s",
|
|
|
|
data->othercareq.filename ? data->othercareq.filename :
|
|
|
|
data->careq.filename, data->clientreq.filename);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Now the real part of the test, setup the sessions */
|
|
|
|
serverSess = virNetTLSSessionNew(serverCtxt, NULL);
|
|
|
|
clientSess = virNetTLSSessionNew(clientCtxt, data->hostname);
|
|
|
|
|
|
|
|
if (!serverSess) {
|
|
|
|
VIR_WARN("Unexpected failure using %s against %s",
|
|
|
|
data->careq.filename, data->serverreq.filename);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
if (!clientSess) {
|
|
|
|
VIR_WARN("Unexpected failure using %s against %s",
|
|
|
|
data->othercareq.filename ? data->othercareq.filename :
|
|
|
|
data->careq.filename, data->clientreq.filename);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* For handshake to work, we need to set the I/O callbacks
|
|
|
|
* to read/write over the socketpair
|
|
|
|
*/
|
|
|
|
virNetTLSSessionSetIOCallbacks(serverSess, testWrite, testRead, &channel[0]);
|
|
|
|
virNetTLSSessionSetIOCallbacks(clientSess, testWrite, testRead, &channel[1]);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Finally we loop around & around doing handshake on each
|
|
|
|
* session until we get an error, or the handshake completes.
|
|
|
|
* This relies on the socketpair being nonblocking to avoid
|
|
|
|
* deadlocking ourselves upon handshake
|
|
|
|
*/
|
|
|
|
do {
|
|
|
|
int rv;
|
|
|
|
if (!serverShake) {
|
|
|
|
rv = virNetTLSSessionHandshake(serverSess);
|
|
|
|
if (rv < 0)
|
|
|
|
goto cleanup;
|
|
|
|
if (rv == VIR_NET_TLS_HANDSHAKE_COMPLETE)
|
|
|
|
serverShake = true;
|
|
|
|
}
|
|
|
|
if (!clientShake) {
|
|
|
|
rv = virNetTLSSessionHandshake(clientSess);
|
|
|
|
if (rv < 0)
|
|
|
|
goto cleanup;
|
|
|
|
if (rv == VIR_NET_TLS_HANDSHAKE_COMPLETE)
|
|
|
|
serverShake = true;
|
|
|
|
}
|
|
|
|
} while (!clientShake && !serverShake);
|
|
|
|
|
|
|
|
|
|
|
|
/* Finally make sure the server validation does what
|
|
|
|
* we were expecting
|
|
|
|
*/
|
|
|
|
if (virNetTLSContextCheckCertificate(serverCtxt,
|
|
|
|
serverSess) < 0) {
|
|
|
|
if (!data->expectServerFail) {
|
|
|
|
VIR_WARN("Unexpected server cert check fail");
|
|
|
|
goto cleanup;
|
|
|
|
} else {
|
|
|
|
VIR_DEBUG("Got expected server cert fail");
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (data->expectServerFail) {
|
|
|
|
VIR_WARN("Expected server cert check fail");
|
|
|
|
goto cleanup;
|
|
|
|
} else {
|
|
|
|
VIR_DEBUG("Not unexpected server cert fail");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* And the same for the client validation check
|
|
|
|
*/
|
|
|
|
if (virNetTLSContextCheckCertificate(clientCtxt,
|
|
|
|
clientSess) < 0) {
|
|
|
|
if (!data->expectClientFail) {
|
|
|
|
VIR_WARN("Unexpected client cert check fail");
|
|
|
|
goto cleanup;
|
|
|
|
} else {
|
|
|
|
VIR_DEBUG("Got expected client cert fail");
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (data->expectClientFail) {
|
|
|
|
VIR_WARN("Expected client cert check fail");
|
|
|
|
goto cleanup;
|
|
|
|
} else {
|
|
|
|
VIR_DEBUG("Not unexpected client cert fail");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
cleanup:
|
2012-07-11 13:35:48 +00:00
|
|
|
virObjectUnref(serverCtxt);
|
|
|
|
virObjectUnref(clientCtxt);
|
|
|
|
virObjectUnref(serverSess);
|
|
|
|
virObjectUnref(clientSess);
|
2011-07-20 18:04:18 +00:00
|
|
|
gnutls_x509_crt_deinit(data->careq.crt);
|
|
|
|
if (data->othercareq.filename)
|
|
|
|
gnutls_x509_crt_deinit(data->othercareq.crt);
|
|
|
|
gnutls_x509_crt_deinit(data->clientreq.crt);
|
|
|
|
gnutls_x509_crt_deinit(data->serverreq.crt);
|
|
|
|
data->careq.crt = data->othercareq.crt = data->clientreq.crt = data->serverreq.crt = NULL;
|
|
|
|
|
|
|
|
/* When troubleshooting this tests, we often want to leave the certs on disk */
|
|
|
|
if (getenv("VIRT_TEST_DEBUG_CERTS") == NULL) {
|
|
|
|
unlink(data->careq.filename);
|
|
|
|
if (data->othercareq.filename)
|
|
|
|
unlink(data->othercareq.filename);
|
|
|
|
unlink(data->clientreq.filename);
|
|
|
|
unlink(data->serverreq.filename);
|
|
|
|
}
|
|
|
|
VIR_FORCE_CLOSE(channel[0]);
|
|
|
|
VIR_FORCE_CLOSE(channel[1]);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
mymain(void)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
if (asn1_array2tree(pkix_asn1_tab, &pkix_asn1, NULL) != ASN1_SUCCESS)
|
|
|
|
abort();
|
|
|
|
|
|
|
|
gnutls_global_init();
|
|
|
|
|
|
|
|
privkey = testTLSLoadKey();
|
|
|
|
|
|
|
|
if (virFileWriteStr(keyfile, PRIVATE_KEY, 0600) < 0)
|
|
|
|
return EXIT_FAILURE;
|
|
|
|
|
test: fix build errors with gcc 4.7.0 and -O0
When building on Fedora 17 (which uses gcc 4.7.0) with -O0 in CFLAGS,
three of the tests failed to compile.
cputest.c and qemuxml2argvtest.c had non-static structs defined
inside the macro that was being repeatedly invoked. Due to some so-far
unidentified change in gcc, the stack space used by variables defined
inside { } is not recovered/re-used when the block ends, so all these
structs have become additive (this is the same problem worked around
in commit cf57d345b). Fortunately, these two files could be fixed with
a single line addition of "static" to the struct definition in the
macro.
virnettlscontexttest.c was a bit different, though. The problem structs
in the do/while loop of macros had non-constant initializers, so it
took a bit more work and piecemeal initialization instead of member
initialization to get things to be happy.
In an ideal world, none of these changes should be necessary, but not
knowing how long it will be until the gcc regressions are fixed, and
since the code is just as correct after this patch as before, it makes
sense to fix libvirt's build for -O0 while also reporting the gcc
problem.
2012-04-05 20:31:36 +00:00
|
|
|
# define DO_CTX_TEST(_isServer, _caReq, _certReq, _expectFail) \
|
2011-07-20 18:04:18 +00:00
|
|
|
do { \
|
test: fix build errors with gcc 4.7.0 and -O0
When building on Fedora 17 (which uses gcc 4.7.0) with -O0 in CFLAGS,
three of the tests failed to compile.
cputest.c and qemuxml2argvtest.c had non-static structs defined
inside the macro that was being repeatedly invoked. Due to some so-far
unidentified change in gcc, the stack space used by variables defined
inside { } is not recovered/re-used when the block ends, so all these
structs have become additive (this is the same problem worked around
in commit cf57d345b). Fortunately, these two files could be fixed with
a single line addition of "static" to the struct definition in the
macro.
virnettlscontexttest.c was a bit different, though. The problem structs
in the do/while loop of macros had non-constant initializers, so it
took a bit more work and piecemeal initialization instead of member
initialization to get things to be happy.
In an ideal world, none of these changes should be necessary, but not
knowing how long it will be until the gcc regressions are fixed, and
since the code is just as correct after this patch as before, it makes
sense to fix libvirt's build for -O0 while also reporting the gcc
problem.
2012-04-05 20:31:36 +00:00
|
|
|
static struct testTLSContextData data; \
|
|
|
|
data.isServer = _isServer; \
|
|
|
|
data.careq = _caReq; \
|
|
|
|
data.certreq = _certReq; \
|
|
|
|
data.expectFail = _expectFail; \
|
2011-07-20 18:04:18 +00:00
|
|
|
if (virtTestRun("TLS Context", 1, testTLSContextInit, &data) < 0) \
|
|
|
|
ret = -1; \
|
|
|
|
} while (0)
|
|
|
|
|
test: fix build errors with gcc 4.7.0 and -O0
When building on Fedora 17 (which uses gcc 4.7.0) with -O0 in CFLAGS,
three of the tests failed to compile.
cputest.c and qemuxml2argvtest.c had non-static structs defined
inside the macro that was being repeatedly invoked. Due to some so-far
unidentified change in gcc, the stack space used by variables defined
inside { } is not recovered/re-used when the block ends, so all these
structs have become additive (this is the same problem worked around
in commit cf57d345b). Fortunately, these two files could be fixed with
a single line addition of "static" to the struct definition in the
macro.
virnettlscontexttest.c was a bit different, though. The problem structs
in the do/while loop of macros had non-constant initializers, so it
took a bit more work and piecemeal initialization instead of member
initialization to get things to be happy.
In an ideal world, none of these changes should be necessary, but not
knowing how long it will be until the gcc regressions are fixed, and
since the code is just as correct after this patch as before, it makes
sense to fix libvirt's build for -O0 while also reporting the gcc
problem.
2012-04-05 20:31:36 +00:00
|
|
|
# define DO_SESS_TEST(_caReq, _serverReq, _clientReq, _expectServerFail,\
|
|
|
|
_expectClientFail, _hostname, _wildcards) \
|
2011-07-20 18:04:18 +00:00
|
|
|
do { \
|
test: fix build errors with gcc 4.7.0 and -O0
When building on Fedora 17 (which uses gcc 4.7.0) with -O0 in CFLAGS,
three of the tests failed to compile.
cputest.c and qemuxml2argvtest.c had non-static structs defined
inside the macro that was being repeatedly invoked. Due to some so-far
unidentified change in gcc, the stack space used by variables defined
inside { } is not recovered/re-used when the block ends, so all these
structs have become additive (this is the same problem worked around
in commit cf57d345b). Fortunately, these two files could be fixed with
a single line addition of "static" to the struct definition in the
macro.
virnettlscontexttest.c was a bit different, though. The problem structs
in the do/while loop of macros had non-constant initializers, so it
took a bit more work and piecemeal initialization instead of member
initialization to get things to be happy.
In an ideal world, none of these changes should be necessary, but not
knowing how long it will be until the gcc regressions are fixed, and
since the code is just as correct after this patch as before, it makes
sense to fix libvirt's build for -O0 while also reporting the gcc
problem.
2012-04-05 20:31:36 +00:00
|
|
|
static struct testTLSSessionData data; \
|
|
|
|
static struct testTLSCertReq other; \
|
|
|
|
data.careq = _caReq; \
|
|
|
|
data.othercareq = other; \
|
|
|
|
data.serverreq = _serverReq; \
|
|
|
|
data.clientreq = _clientReq; \
|
|
|
|
data.expectServerFail = _expectServerFail; \
|
|
|
|
data.expectClientFail = _expectClientFail; \
|
|
|
|
data.hostname = _hostname; \
|
|
|
|
data.wildcards = _wildcards; \
|
2011-07-20 18:04:18 +00:00
|
|
|
if (virtTestRun("TLS Session", 1, testTLSSessionInit, &data) < 0) \
|
|
|
|
ret = -1; \
|
|
|
|
} while (0)
|
|
|
|
|
test: fix build errors with gcc 4.7.0 and -O0
When building on Fedora 17 (which uses gcc 4.7.0) with -O0 in CFLAGS,
three of the tests failed to compile.
cputest.c and qemuxml2argvtest.c had non-static structs defined
inside the macro that was being repeatedly invoked. Due to some so-far
unidentified change in gcc, the stack space used by variables defined
inside { } is not recovered/re-used when the block ends, so all these
structs have become additive (this is the same problem worked around
in commit cf57d345b). Fortunately, these two files could be fixed with
a single line addition of "static" to the struct definition in the
macro.
virnettlscontexttest.c was a bit different, though. The problem structs
in the do/while loop of macros had non-constant initializers, so it
took a bit more work and piecemeal initialization instead of member
initialization to get things to be happy.
In an ideal world, none of these changes should be necessary, but not
knowing how long it will be until the gcc regressions are fixed, and
since the code is just as correct after this patch as before, it makes
sense to fix libvirt's build for -O0 while also reporting the gcc
problem.
2012-04-05 20:31:36 +00:00
|
|
|
# define DO_SESS_TEST_EXT(_caReq, _othercaReq, _serverReq, _clientReq, \
|
|
|
|
_expectServerFail, _expectClientFail, \
|
|
|
|
_hostname, _wildcards) \
|
2011-07-20 18:04:18 +00:00
|
|
|
do { \
|
test: fix build errors with gcc 4.7.0 and -O0
When building on Fedora 17 (which uses gcc 4.7.0) with -O0 in CFLAGS,
three of the tests failed to compile.
cputest.c and qemuxml2argvtest.c had non-static structs defined
inside the macro that was being repeatedly invoked. Due to some so-far
unidentified change in gcc, the stack space used by variables defined
inside { } is not recovered/re-used when the block ends, so all these
structs have become additive (this is the same problem worked around
in commit cf57d345b). Fortunately, these two files could be fixed with
a single line addition of "static" to the struct definition in the
macro.
virnettlscontexttest.c was a bit different, though. The problem structs
in the do/while loop of macros had non-constant initializers, so it
took a bit more work and piecemeal initialization instead of member
initialization to get things to be happy.
In an ideal world, none of these changes should be necessary, but not
knowing how long it will be until the gcc regressions are fixed, and
since the code is just as correct after this patch as before, it makes
sense to fix libvirt's build for -O0 while also reporting the gcc
problem.
2012-04-05 20:31:36 +00:00
|
|
|
static struct testTLSSessionData data; \
|
|
|
|
data.careq = _caReq; \
|
|
|
|
data.othercareq = _othercaReq; \
|
|
|
|
data.serverreq = _serverReq; \
|
|
|
|
data.clientreq = _clientReq; \
|
|
|
|
data.expectServerFail = _expectServerFail; \
|
|
|
|
data.expectClientFail = _expectClientFail; \
|
|
|
|
data.hostname = _hostname; \
|
|
|
|
data.wildcards = _wildcards; \
|
2011-07-20 18:04:18 +00:00
|
|
|
if (virtTestRun("TLS Session", 1, testTLSSessionInit, &data) < 0) \
|
|
|
|
ret = -1; \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
/* A perfect CA, perfect client & perfect server */
|
|
|
|
|
|
|
|
/* Basic:CA:critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq cacertreq = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "cacert.pem", "UK",
|
|
|
|
"libvirt CA", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, true,
|
|
|
|
true, true, GNUTLS_KEY_KEY_CERT_SIGN,
|
|
|
|
false, false, NULL, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq servercertreq = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "servercert.pem", "UK",
|
|
|
|
"libvirt.org", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
true, true, GNUTLS_KEY_DIGITAL_SIGNATURE | GNUTLS_KEY_KEY_ENCIPHERMENT,
|
|
|
|
true, true, GNUTLS_KP_TLS_WWW_SERVER, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq clientcertreq = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "clientcert.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
true, true, GNUTLS_KEY_DIGITAL_SIGNATURE | GNUTLS_KEY_KEY_ENCIPHERMENT,
|
|
|
|
true, true, GNUTLS_KP_TLS_WWW_CLIENT, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
DO_CTX_TEST(true, cacertreq, servercertreq, false);
|
|
|
|
DO_CTX_TEST(false, cacertreq, clientcertreq, false);
|
|
|
|
|
|
|
|
|
|
|
|
/* Some other CAs which are good */
|
|
|
|
|
|
|
|
/* Basic:CA:critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq cacert1req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "cacert1.pem", "UK",
|
|
|
|
"libvirt CA 1", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, true,
|
|
|
|
false, false, 0,
|
|
|
|
false, false, NULL, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* Basic:CA:not-critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq cacert2req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "cacert2.pem", "UK",
|
|
|
|
"libvirt CA 2", NULL, NULL, NULL, NULL,
|
|
|
|
true, false, true,
|
|
|
|
false, false, 0,
|
|
|
|
false, false, NULL, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* Basic:not-CA:not-critical */
|
|
|
|
# if 0
|
|
|
|
/* Default GNUTLS session config forbids use of CAs without
|
|
|
|
* basic constraints, so skip this otherwise valid test
|
|
|
|
*/
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq cacert3req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "cacert3.pem", "UK",
|
|
|
|
"libvirt CA 3", NULL, NULL, NULL, NULL,
|
|
|
|
true, false, false,
|
|
|
|
false, false, 0,
|
|
|
|
false, false, NULL, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
# endif
|
|
|
|
/* Key usage:cert-sign:critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq cacert4req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "cacert4.pem", "UK",
|
|
|
|
"libvirt CA 4", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, true,
|
|
|
|
true, true, GNUTLS_KEY_KEY_CERT_SIGN,
|
|
|
|
false, false, NULL, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* Key usage:dig-sig:not-critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq cacert5req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "cacert5.pem", "UK",
|
|
|
|
"libvirt CA 5", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, true,
|
|
|
|
true, false, GNUTLS_KEY_DIGITAL_SIGNATURE,
|
|
|
|
false, false, NULL, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
|
|
|
|
DO_CTX_TEST(true, cacert1req, servercertreq, false);
|
|
|
|
DO_CTX_TEST(true, cacert2req, servercertreq, false);
|
|
|
|
# if 0
|
|
|
|
DO_CTX_TEST(true, cacert3req, servercertreq, false);
|
|
|
|
# endif
|
|
|
|
DO_CTX_TEST(true, cacert4req, servercertreq, false);
|
|
|
|
DO_CTX_TEST(true, cacert5req, servercertreq, false);
|
|
|
|
|
|
|
|
/* Now some bad certs */
|
|
|
|
|
|
|
|
/* no-basic */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq cacert6req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "cacert6.pem", "UK",
|
|
|
|
"libvirt CA 6", NULL, NULL, NULL, NULL,
|
|
|
|
false, false, false,
|
|
|
|
false, false, 0,
|
|
|
|
false, false, NULL, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* Key usage:dig-sig:critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq cacert7req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "cacert7.pem", "UK",
|
|
|
|
"libvirt CA 7", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, true,
|
|
|
|
true, true, GNUTLS_KEY_DIGITAL_SIGNATURE,
|
|
|
|
false, false, NULL, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
|
|
|
|
DO_CTX_TEST(true, cacert6req, servercertreq, true);
|
|
|
|
DO_CTX_TEST(true, cacert7req, servercertreq, true);
|
|
|
|
|
|
|
|
|
|
|
|
/* Various good servers */
|
|
|
|
/* no usage or purpose */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq servercert1req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "servercert1.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
false, false, 0,
|
|
|
|
false, false, NULL, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* usage:cert-sign+dig-sig+encipher:critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq servercert2req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "servercert2.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
true, true, GNUTLS_KEY_DIGITAL_SIGNATURE | GNUTLS_KEY_KEY_ENCIPHERMENT | GNUTLS_KEY_KEY_CERT_SIGN,
|
|
|
|
false, false, NULL, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* usage:cert-sign:not-critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq servercert3req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "servercert3.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
true, false, GNUTLS_KEY_KEY_CERT_SIGN,
|
|
|
|
false, false, NULL, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* purpose:server:critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq servercert4req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "servercert4.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
false, false, 0,
|
|
|
|
true, true, GNUTLS_KP_TLS_WWW_SERVER, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* purpose:server:not-critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq servercert5req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "servercert5.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
false, false, 0,
|
|
|
|
true, false, GNUTLS_KP_TLS_WWW_SERVER, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* purpose:client+server:critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq servercert6req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "servercert6.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
false, false, 0,
|
|
|
|
true, true, GNUTLS_KP_TLS_WWW_CLIENT, GNUTLS_KP_TLS_WWW_SERVER,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* purpose:client+server:not-critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq servercert7req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "servercert7.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
false, false, 0,
|
|
|
|
true, false, GNUTLS_KP_TLS_WWW_CLIENT, GNUTLS_KP_TLS_WWW_SERVER,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
|
|
|
|
DO_CTX_TEST(true, cacertreq, servercert1req, false);
|
|
|
|
DO_CTX_TEST(true, cacertreq, servercert2req, false);
|
|
|
|
DO_CTX_TEST(true, cacertreq, servercert3req, false);
|
|
|
|
DO_CTX_TEST(true, cacertreq, servercert4req, false);
|
|
|
|
DO_CTX_TEST(true, cacertreq, servercert5req, false);
|
|
|
|
DO_CTX_TEST(true, cacertreq, servercert6req, false);
|
|
|
|
DO_CTX_TEST(true, cacertreq, servercert7req, false);
|
|
|
|
/* Bad servers */
|
|
|
|
|
|
|
|
/* usage:cert-sign:critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq servercert8req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "servercert8.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
true, true, GNUTLS_KEY_KEY_CERT_SIGN,
|
|
|
|
false, false, NULL, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* purpose:client:critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq servercert9req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "servercert9.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
false, false, 0,
|
|
|
|
true, true, GNUTLS_KP_TLS_WWW_CLIENT, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* usage: none:critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq servercert10req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "servercert10.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
true, true, 0,
|
|
|
|
false, false, NULL, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
|
|
|
|
DO_CTX_TEST(true, cacertreq, servercert8req, true);
|
|
|
|
DO_CTX_TEST(true, cacertreq, servercert9req, true);
|
|
|
|
DO_CTX_TEST(true, cacertreq, servercert10req, true);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Various good clients */
|
|
|
|
/* no usage or purpose */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq clientcert1req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "clientcert1.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
false, false, 0,
|
|
|
|
false, false, NULL, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* usage:cert-sign+dig-sig+encipher:critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq clientcert2req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "clientcert2.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
true, true, GNUTLS_KEY_DIGITAL_SIGNATURE | GNUTLS_KEY_KEY_ENCIPHERMENT | GNUTLS_KEY_KEY_CERT_SIGN,
|
|
|
|
false, false, NULL, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* usage:cert-sign:not-critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq clientcert3req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "clientcert3.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
true, false, GNUTLS_KEY_KEY_CERT_SIGN,
|
|
|
|
false, false, NULL, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* purpose:client:critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq clientcert4req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "clientcert4.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
false, false, 0,
|
|
|
|
true, true, GNUTLS_KP_TLS_WWW_CLIENT, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* purpose:client:not-critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq clientcert5req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "clientcert5.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
false, false, 0,
|
|
|
|
true, false, GNUTLS_KP_TLS_WWW_CLIENT, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* purpose:client+client:critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq clientcert6req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "clientcert6.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
false, false, 0,
|
|
|
|
true, true, GNUTLS_KP_TLS_WWW_CLIENT, GNUTLS_KP_TLS_WWW_SERVER,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* purpose:client+client:not-critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq clientcert7req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "clientcert7.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
false, false, 0,
|
|
|
|
true, false, GNUTLS_KP_TLS_WWW_CLIENT, GNUTLS_KP_TLS_WWW_SERVER,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
|
|
|
|
DO_CTX_TEST(false, cacertreq, clientcert1req, false);
|
|
|
|
DO_CTX_TEST(false, cacertreq, clientcert2req, false);
|
|
|
|
DO_CTX_TEST(false, cacertreq, clientcert3req, false);
|
|
|
|
DO_CTX_TEST(false, cacertreq, clientcert4req, false);
|
|
|
|
DO_CTX_TEST(false, cacertreq, clientcert5req, false);
|
|
|
|
DO_CTX_TEST(false, cacertreq, clientcert6req, false);
|
|
|
|
DO_CTX_TEST(false, cacertreq, clientcert7req, false);
|
|
|
|
/* Bad clients */
|
|
|
|
|
|
|
|
/* usage:cert-sign:critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq clientcert8req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "clientcert8.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
true, true, GNUTLS_KEY_KEY_CERT_SIGN,
|
|
|
|
false, false, NULL, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* purpose:client:critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq clientcert9req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "clientcert9.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
false, false, 0,
|
|
|
|
true, true, GNUTLS_KP_TLS_WWW_SERVER, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* usage: none:critical */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq clientcert10req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "clientcert10.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
true, true, 0,
|
|
|
|
false, false, NULL, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
|
|
|
|
DO_CTX_TEST(false, cacertreq, clientcert8req, true);
|
|
|
|
DO_CTX_TEST(false, cacertreq, clientcert9req, true);
|
|
|
|
DO_CTX_TEST(false, cacertreq, clientcert10req, true);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Expired stuff */
|
|
|
|
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq cacertexpreq = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "cacert.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, true,
|
|
|
|
true, true, GNUTLS_KEY_KEY_CERT_SIGN,
|
|
|
|
false, false, NULL, NULL,
|
2011-07-25 15:18:56 +00:00
|
|
|
0, -1,
|
2011-07-20 18:04:18 +00:00
|
|
|
};
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq servercertexpreq = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "servercert.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
true, true, GNUTLS_KEY_DIGITAL_SIGNATURE | GNUTLS_KEY_KEY_ENCIPHERMENT,
|
|
|
|
true, true, GNUTLS_KP_TLS_WWW_SERVER, NULL,
|
2011-07-25 15:18:56 +00:00
|
|
|
0, -1,
|
2011-07-20 18:04:18 +00:00
|
|
|
};
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq clientcertexpreq = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "clientcert.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
true, true, GNUTLS_KEY_DIGITAL_SIGNATURE | GNUTLS_KEY_KEY_ENCIPHERMENT,
|
|
|
|
true, true, GNUTLS_KP_TLS_WWW_CLIENT, NULL,
|
2011-07-25 15:18:56 +00:00
|
|
|
0, -1,
|
2011-07-20 18:04:18 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
DO_CTX_TEST(true, cacertexpreq, servercertreq, true);
|
|
|
|
DO_CTX_TEST(true, cacertreq, servercertexpreq, true);
|
|
|
|
DO_CTX_TEST(false, cacertreq, clientcertexpreq, true);
|
|
|
|
|
|
|
|
|
|
|
|
/* Not activated stuff */
|
|
|
|
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq cacertnewreq = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "cacert.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, true,
|
|
|
|
true, true, GNUTLS_KEY_KEY_CERT_SIGN,
|
|
|
|
false, false, NULL, NULL,
|
2011-07-22 17:59:37 +00:00
|
|
|
1, 2,
|
2011-07-20 18:04:18 +00:00
|
|
|
};
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq servercertnewreq = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "servercert.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
true, true, GNUTLS_KEY_DIGITAL_SIGNATURE | GNUTLS_KEY_KEY_ENCIPHERMENT,
|
|
|
|
true, true, GNUTLS_KP_TLS_WWW_SERVER, NULL,
|
2011-07-22 17:59:37 +00:00
|
|
|
1, 2,
|
2011-07-20 18:04:18 +00:00
|
|
|
};
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq clientcertnewreq = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "clientcert.pem", "UK",
|
|
|
|
"libvirt", NULL, NULL, NULL, NULL,
|
|
|
|
true, true, false,
|
|
|
|
true, true, GNUTLS_KEY_DIGITAL_SIGNATURE | GNUTLS_KEY_KEY_ENCIPHERMENT,
|
|
|
|
true, true, GNUTLS_KP_TLS_WWW_CLIENT, NULL,
|
2011-07-22 17:59:37 +00:00
|
|
|
1, 2,
|
2011-07-20 18:04:18 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
DO_CTX_TEST(true, cacertnewreq, servercertreq, true);
|
|
|
|
DO_CTX_TEST(true, cacertreq, servercertnewreq, true);
|
|
|
|
DO_CTX_TEST(false, cacertreq, clientcertnewreq, true);
|
|
|
|
|
|
|
|
|
|
|
|
DO_SESS_TEST(cacertreq, servercertreq, clientcertreq, false, false, "libvirt.org", NULL);
|
|
|
|
DO_SESS_TEST_EXT(cacertreq, cacert1req, servercertreq, clientcertreq, true, true, "libvirt.org", NULL);
|
|
|
|
|
|
|
|
/* When an altname is set, the CN is ignored, so it must be duplicated
|
|
|
|
* as an altname for it to match */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq servercertalt1req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "servercert.pem", "UK",
|
|
|
|
"libvirt.org", "www.libvirt.org", "libvirt.org", "192.168.122.1", "fec0::dead:beaf",
|
|
|
|
true, true, false,
|
|
|
|
true, true, GNUTLS_KEY_DIGITAL_SIGNATURE | GNUTLS_KEY_KEY_ENCIPHERMENT,
|
|
|
|
true, true, GNUTLS_KP_TLS_WWW_SERVER, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
/* This intentionally doesn't replicate */
|
2011-07-22 17:59:37 +00:00
|
|
|
static struct testTLSCertReq servercertalt2req = {
|
2011-07-20 18:04:18 +00:00
|
|
|
NULL, NULL, "servercert.pem", "UK",
|
|
|
|
"libvirt.org", "www.libvirt.org", "wiki.libvirt.org", "192.168.122.1", "fec0::dead:beaf",
|
|
|
|
true, true, false,
|
|
|
|
true, true, GNUTLS_KEY_DIGITAL_SIGNATURE | GNUTLS_KEY_KEY_ENCIPHERMENT,
|
|
|
|
true, true, GNUTLS_KP_TLS_WWW_SERVER, NULL,
|
|
|
|
0, 0,
|
|
|
|
};
|
|
|
|
|
|
|
|
DO_SESS_TEST(cacertreq, servercertalt1req, clientcertreq, false, false, "libvirt.org", NULL);
|
|
|
|
DO_SESS_TEST(cacertreq, servercertalt1req, clientcertreq, false, false, "www.libvirt.org", NULL);
|
|
|
|
DO_SESS_TEST(cacertreq, servercertalt1req, clientcertreq, false, true, "wiki.libvirt.org", NULL);
|
|
|
|
|
|
|
|
DO_SESS_TEST(cacertreq, servercertalt2req, clientcertreq, false, true, "libvirt.org", NULL);
|
|
|
|
DO_SESS_TEST(cacertreq, servercertalt2req, clientcertreq, false, false, "www.libvirt.org", NULL);
|
|
|
|
DO_SESS_TEST(cacertreq, servercertalt2req, clientcertreq, false, false, "wiki.libvirt.org", NULL);
|
|
|
|
|
|
|
|
const char *const wildcards1[] = {
|
|
|
|
"C=UK,CN=dogfood",
|
|
|
|
NULL,
|
|
|
|
};
|
|
|
|
const char *const wildcards2[] = {
|
|
|
|
"C=UK,CN=libvirt",
|
|
|
|
NULL,
|
|
|
|
};
|
|
|
|
const char *const wildcards3[] = {
|
|
|
|
"C=UK,CN=dogfood",
|
|
|
|
"C=UK,CN=libvirt",
|
|
|
|
NULL,
|
|
|
|
};
|
|
|
|
const char *const wildcards4[] = {
|
|
|
|
"C=UK,CN=libvirtstuff",
|
|
|
|
NULL,
|
|
|
|
};
|
|
|
|
const char *const wildcards5[] = {
|
|
|
|
"C=UK,CN=libvirt*",
|
|
|
|
NULL,
|
|
|
|
};
|
|
|
|
const char *const wildcards6[] = {
|
|
|
|
"C=UK,CN=*virt*",
|
|
|
|
NULL,
|
|
|
|
};
|
|
|
|
|
|
|
|
DO_SESS_TEST(cacertreq, servercertreq, clientcertreq, true, false, "libvirt.org", wildcards1);
|
|
|
|
DO_SESS_TEST(cacertreq, servercertreq, clientcertreq, false, false, "libvirt.org", wildcards2);
|
|
|
|
DO_SESS_TEST(cacertreq, servercertreq, clientcertreq, false, false, "libvirt.org", wildcards3);
|
|
|
|
DO_SESS_TEST(cacertreq, servercertreq, clientcertreq, true, false, "libvirt.org", wildcards4);
|
|
|
|
DO_SESS_TEST(cacertreq, servercertreq, clientcertreq, false, false, "libvirt.org", wildcards5);
|
|
|
|
DO_SESS_TEST(cacertreq, servercertreq, clientcertreq, false, false, "libvirt.org", wildcards6);
|
|
|
|
|
|
|
|
unlink(keyfile);
|
|
|
|
|
|
|
|
asn1_delete_structure(&pkix_asn1);
|
|
|
|
|
2012-03-22 11:33:35 +00:00
|
|
|
return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE;
|
2011-07-20 18:04:18 +00:00
|
|
|
}
|
|
|
|
|
2011-07-22 17:59:37 +00:00
|
|
|
VIRT_TEST_MAIN(mymain)
|
|
|
|
|
2011-07-20 18:04:18 +00:00
|
|
|
#else
|
2011-07-28 15:48:12 +00:00
|
|
|
|
2011-07-22 17:59:37 +00:00
|
|
|
int
|
2011-07-28 15:48:12 +00:00
|
|
|
main(void)
|
2011-07-20 18:04:18 +00:00
|
|
|
{
|
2011-07-28 15:48:12 +00:00
|
|
|
return EXIT_AM_SKIP;
|
2011-07-20 18:04:18 +00:00
|
|
|
}
|
2011-07-28 15:48:12 +00:00
|
|
|
|
2011-07-20 18:04:18 +00:00
|
|
|
#endif
|