# To use this configuration file with the "-extfile" option of the
# "openssl x509" utility, name here the section containing the
# X.509v3 extensions to use:
-# extensions =
+# extensions =
# (Alternatively, use a configuration file that has only
# X.509v3 extensions in its main [= default] section.)
# input_password = secret
# output_password = secret
-# This sets a mask for permitted string types. There are several options.
+# This sets a mask for permitted string types. There are several options.
# default: PrintableString, T61String, BMPString.
# pkix : PrintableString, BMPString (PKIX recommendation before 2004)
# utf8only: only UTF8Strings (PKIX recommendation after 2004).
-/* $OpenBSD: apps.c,v 1.66 2014/07/13 16:03:09 beck Exp $ */
+/* $OpenBSD: apps.c,v 1.67 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
int *mval;
/*
- * Buffer to copy the types and values into. Due to escaping the
+ * Buffer to copy the types and values into. Due to escaping the
* copy can only become shorter.
*/
buflen = strlen(subject) + 1;
-/* $OpenBSD: asn1pars.c,v 1.26 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: asn1pars.c,v 1.27 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
if (osk != NULL)
sk_OPENSSL_STRING_free(osk);
OBJ_cleanup();
-
+
return (ret);
}
-/* $OpenBSD: ca.c,v 1.63 2014/07/13 16:03:09 beck Exp $ */
+/* $OpenBSD: ca.c,v 1.64 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
NCONF_free(conf);
NCONF_free(extconf);
OBJ_cleanup();
-
+
return (ret);
}
-/* $OpenBSD: ciphers.c,v 1.25 2014/07/12 19:31:21 jsing Exp $ */
+/* $OpenBSD: ciphers.c,v 1.26 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
SSL_free(ssl);
if (STDout != NULL)
BIO_free_all(STDout);
-
+
return (ret);
}
-/* $OpenBSD: crl.c,v 1.24 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: crl.c,v 1.25 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
X509_STORE_CTX_cleanup(&ctx);
X509_STORE_free(store);
}
-
+
return (ret);
}
-/* $OpenBSD: crl2p7.c,v 1.19 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: crl2p7.c,v 1.20 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
if (crl != NULL)
X509_CRL_free(crl);
-
+
return (ret);
}
-/* $OpenBSD: dgst.c,v 1.38 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: dgst.c,v 1.39 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
free(sigbuf);
if (bmd != NULL)
BIO_free(bmd);
-
+
return (err);
}
-/* $OpenBSD: dh.c,v 1.24 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: dh.c,v 1.25 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
BIO_free_all(out);
if (dh != NULL)
DH_free(dh);
-
+
return (ret);
}
#endif
-/* $OpenBSD: dhparam.c,v 1.32 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: dhparam.c,v 1.33 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
BIO_free_all(out);
if (dh != NULL)
DH_free(dh);
-
+
return (ret);
}
-/* $OpenBSD: dsa.c,v 1.27 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: dsa.c,v 1.28 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
DSA_free(dsa);
free(passin);
free(passout);
-
+
return (ret);
}
-/* $OpenBSD: dsaparam.c,v 1.33 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: dsaparam.c,v 1.34 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
BIO_free_all(out);
if (dsa != NULL)
DSA_free(dsa);
-
+
return (ret);
}
-/* $OpenBSD: ec.c,v 1.15 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: ec.c,v 1.16 2014/07/14 00:35:10 deraadt Exp $ */
/*
* Written by Nils Larsch for the OpenSSL project.
*/
EC_KEY_free(eckey);
free(passin);
free(passout);
-
+
return (ret);
}
#endif
-/* $OpenBSD: ecparam.c,v 1.22 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: ecparam.c,v 1.23 2014/07/14 00:35:10 deraadt Exp $ */
/*
* Written by Nils Larsch for the OpenSSL project.
*/
int ecparam_main(int, char **);
-int
+int
ecparam_main(int argc, char **argv)
{
EC_GROUP *group = NULL;
BIO_free_all(out);
if (group != NULL)
EC_GROUP_free(group);
-
+
return (ret);
}
-static int
+static int
ecparam_print_var(BIO * out, BIGNUM * in, const char *var,
int len, unsigned char *buffer)
{
-/* $OpenBSD: enc.c,v 1.37 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: enc.c,v 1.38 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
#define BSIZE (8*1024)
#define PROG enc_main
-static void
+static void
show_ciphers(const OBJ_NAME * name, void *bio_)
{
BIO *bio = bio_;
int enc_main(int, char **);
-int
+int
enc_main(int argc, char **argv)
{
static const char magic[] = "Salted__";
BIO_free(bzl);
#endif
free(pass);
-
+
return (ret);
}
-int
+int
set_hex(char *in, unsigned char *out, int size)
{
int i, n;
-/* $OpenBSD: engine.c,v 1.26 2014/07/12 19:31:21 jsing Exp $ */
+/* $OpenBSD: engine.c,v 1.27 2014/07/14 00:35:10 deraadt Exp $ */
/* Written by Richard Levitte <richard@levitte.org> for the OpenSSL
* project 2000.
*/
NULL
};
-static void
+static void
identity(char *ptr)
{
return;
}
-static int
+static int
append_buf(char **buf, const char *s, int *size, int step)
{
int l = strlen(s);
return 1;
}
-static int
+static int
util_flags(BIO * bio_out, unsigned int flags, const char *indent)
{
int started = 0, err = 0;
return 1;
}
-static int
+static int
util_verbose(ENGINE * e, int verbose, BIO * bio_out, const char *indent)
{
static const int line_wrap = 78;
return ret;
}
-static void
+static void
util_do_cmds(ENGINE * e, STACK_OF(OPENSSL_STRING) * cmds,
BIO * bio_out, const char *indent)
{
int engine_main(int, char **);
-int
+int
engine_main(int argc, char **argv)
{
int ret = 1, i;
sk_OPENSSL_STRING_pop_free(post_cmds, identity);
if (bio_out != NULL)
BIO_free_all(bio_out);
-
+
return (ret);
}
#endif
-/* $OpenBSD: errstr.c,v 1.18 2014/07/12 19:31:21 jsing Exp $ */
+/* $OpenBSD: errstr.c,v 1.19 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
ret++;
}
}
-
+
return (ret);
}
-/* $OpenBSD: gendh.c,v 1.27 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: gendh.c,v 1.28 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
BIO_free_all(out);
if (dh != NULL)
DH_free(dh);
-
+
return (ret);
}
-/* $OpenBSD: gendsa.c,v 1.29 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: gendsa.c,v 1.30 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
if (dsa != NULL)
DSA_free(dsa);
free(passout);
-
+
return (ret);
}
-/* $OpenBSD: genpkey.c,v 1.12 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: genpkey.c,v 1.13 2014/07/14 00:35:10 deraadt Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2006
*/
#include <openssl/engine.h>
#endif
-static int
+static int
init_keygen_file(BIO * err, EVP_PKEY_CTX ** pctx, const char *file,
ENGINE * e);
static int genpkey_cb(EVP_PKEY_CTX * ctx);
-/* $OpenBSD: genrsa.c,v 1.36 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: genrsa.c,v 1.37 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
free(passout);
if (ret != 0)
ERR_print_errors(bio_err);
-
+
return (ret);
}
-/* $OpenBSD: nseq.c,v 1.15 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: nseq.c,v 1.16 2014/07/14 00:35:10 deraadt Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 1999.
*/
int nseq_main(int, char **);
-int
+int
nseq_main(int argc, char **argv)
{
char **args, *infile = NULL, *outfile = NULL;
# To use this configuration file with the "-extfile" option of the
# "openssl x509" utility, name here the section containing the
# X.509v3 extensions to use:
-# extensions =
+# extensions =
# (Alternatively, use a configuration file that has only
# X.509v3 extensions in its main [= default] section.)
# input_password = secret
# output_password = secret
-# This sets a mask for permitted string types. There are several options.
+# This sets a mask for permitted string types. There are several options.
# default: PrintableString, T61String, BMPString.
# pkix : PrintableString, BMPString (PKIX recommendation before 2004)
# utf8only: only UTF8Strings (PKIX recommendation after 2004).
-/* $OpenBSD: passwd.c,v 1.22 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: passwd.c,v 1.23 2014/07/14 00:35:10 deraadt Exp $ */
#if defined OPENSSL_NO_MD5
#define NO_MD5CRYPT_1
0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A
};
-static int
+static int
do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
char *passwd, BIO * out, int quiet, int table, int reverse,
size_t pw_maxlen, int usecrypt, int use1, int useapr1);
int passwd_main(int, char **);
-int
+int
passwd_main(int argc, char **argv)
{
int ret = 1;
BIO_free(in);
if (out)
BIO_free_all(out);
-
+
return (ret);
}
#endif
-static int
+static int
do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
char *passwd, BIO * out, int quiet, int table, int reverse,
size_t pw_maxlen, int usecrypt, int use1, int useapr1)
}
#else
-int
+int
passwd_main(int argc, char **argv)
{
fputs("Program not available.\n", stderr)
-/* $OpenBSD: pkcs12.c,v 1.37 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: pkcs12.c,v 1.38 2014/07/14 00:35:10 deraadt Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project.
*/
sk_OPENSSL_STRING_free(canames);
free(passin);
free(passout);
-
+
return (ret);
}
-int
+int
dump_certs_keys_p12(BIO * out, PKCS12 * p12, char *pass,
int passlen, int options, char *pempass)
{
return ret;
}
-int
+int
dump_certs_pkeys_bags(BIO * out, STACK_OF(PKCS12_SAFEBAG) * bags,
char *pass, int passlen, int options, char *pempass)
{
return 1;
}
-int
+int
dump_certs_pkeys_bag(BIO * out, PKCS12_SAFEBAG * bag, char *pass,
int passlen, int options, char *pempass)
{
/* Hope this is OK .... */
-int
+int
get_cert_chain(X509 * cert, X509_STORE * store, STACK_OF(X509) ** chain)
{
X509_STORE_CTX store_ctx;
return i;
}
-int
+int
alg_print(BIO * x, X509_ALGOR * alg)
{
PBEPARAM *pbe;
/* Load all certificates from a given file */
-int
+int
cert_load(BIO * in, STACK_OF(X509) * sk)
{
int ret;
/* Generalised attribute print: handle PKCS#8 and bag attributes */
-int
+int
print_attribs(BIO * out, STACK_OF(X509_ATTRIBUTE) * attrlst, const char *name)
{
X509_ATTRIBUTE *attr;
return 1;
}
-void
+void
hex_prin(BIO * out, unsigned char *buf, int len)
{
int i;
BIO_printf(out, "%02X ", buf[i]);
}
-static int
+static int
set_pbe(BIO * err, int *ppbe, const char *str)
{
if (!str)
-/* $OpenBSD: pkcs7.c,v 1.20 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: pkcs7.c,v 1.21 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
int pkcs7_main(int, char **);
-int
+int
pkcs7_main(int argc, char **argv)
{
PKCS7 *p7 = NULL;
BIO_free(in);
if (out != NULL)
BIO_free_all(out);
-
+
return (ret);
}
-/* $OpenBSD: pkcs8.c,v 1.20 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: pkcs8.c,v 1.21 2014/07/14 00:35:10 deraadt Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 1999-2004.
*/
int pkcs8_main(int, char **);
-int
+int
pkcs8_main(int argc, char **argv)
{
ENGINE *e = NULL;
-/* $OpenBSD: pkey.c,v 1.10 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: pkey.c,v 1.11 2014/07/14 00:35:10 deraadt Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2006
*/
int pkey_main(int, char **);
-int
+int
pkey_main(int argc, char **argv)
{
ENGINE *e = NULL;
-/* $OpenBSD: pkeyparam.c,v 1.8 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: pkeyparam.c,v 1.9 2014/07/14 00:35:10 deraadt Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2006
*/
int pkeyparam_main(int, char **);
-int
+int
pkeyparam_main(int argc, char **argv)
{
char **args, *infile = NULL, *outfile = NULL;
-/* $OpenBSD: pkeyutl.c,v 1.13 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: pkeyutl.c,v 1.14 2014/07/14 00:35:10 deraadt Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2006.
*/
int pkeyutl_main(int argc, char **);
-int
+int
pkeyutl_main(int argc, char **argv)
{
BIO *in = NULL, *out = NULL;
return ret;
}
-static void
+static void
usage()
{
BIO_printf(bio_err, "Usage: pkeyutl [options]\n");
}
-static int
+static int
setup_peer(BIO * err, EVP_PKEY_CTX * ctx, int peerform,
const char *file)
{
return ret;
}
-static int
+static int
do_keyop(EVP_PKEY_CTX * ctx, int pkey_op,
unsigned char *out, size_t * poutlen,
unsigned char *in, size_t inlen)
-/* $OpenBSD: prime.c,v 1.11 2014/06/28 04:39:41 deraadt Exp $ */
+/* $OpenBSD: prime.c,v 1.12 2014/07/14 00:35:10 deraadt Exp $ */
/* ====================================================================
* Copyright (c) 2004 The OpenSSL Project. All rights reserved.
*
int prime_main(int, char **);
-int
+int
prime_main(int argc, char **argv)
{
int hex = 0;
-/* $OpenBSD: rand.c,v 1.21 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: rand.c,v 1.22 2014/07/14 00:35:10 deraadt Exp $ */
/* ====================================================================
* Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
*
int rand_main(int, char **);
-int
+int
rand_main(int argc, char **argv)
{
int i, r, ret = 1;
ERR_print_errors(bio_err);
if (out)
BIO_free_all(out);
-
+
return (ret);
}
-/* $OpenBSD: req.c,v 1.45 2014/07/09 21:02:35 tedu Exp $ */
+/* $OpenBSD: req.c,v 1.46 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
if (passargout && passout)
free(passout);
OBJ_cleanup();
-
+
return (ex);
}
-static int
+static int
make_REQ(X509_REQ * req, EVP_PKEY * pkey, char *subj, int multirdn,
int attribs, unsigned long chtype)
{
* subject is expected to be in the format /type0=value0/type1=value1/type2=...
* where characters may be escaped by \
*/
-static int
+static int
build_subject(X509_REQ * req, char *subject, unsigned long chtype, int multirdn)
{
X509_NAME *n;
}
-static int
+static int
prompt_info(X509_REQ * req,
STACK_OF(CONF_VALUE) * dn_sk, char *dn_sect,
STACK_OF(CONF_VALUE) * attr_sk, char *attr_sect, int attribs,
}
-static int
+static int
auto_info(X509_REQ * req, STACK_OF(CONF_VALUE) * dn_sk,
STACK_OF(CONF_VALUE) * attr_sk, int attribs, unsigned long chtype)
{
}
-static int
+static int
add_DN_object(X509_NAME * n, char *text, const char *def, char *value,
int nid, int n_min, int n_max, unsigned long chtype, int mval)
{
return (ret);
}
-static int
+static int
add_attribute_object(X509_REQ * req, char *text, const char *def,
char *value, int nid, int n_min,
int n_max, unsigned long chtype)
return (0);
}
-static int
+static int
req_check_len(int len, int n_min, int n_max)
{
if ((n_min > 0) && (len < n_min)) {
}
/* Check if the end of a string matches 'end' */
-static int
+static int
check_end(const char *str, const char *end)
{
int elen, slen;
if (errstr) {
BIO_printf(err, "bad algorithm %s: %s\n", gstr, errstr);
return NULL;
- }
+ }
*pkeylen = keylen;
} else if (!strncmp(gstr, "param:", 6))
paramfile = gstr + 6;
if (errstr) {
BIO_printf(err, "bad algorithm %s: %s\n",
p + 1, errstr);
- return NULL;
+ return NULL;
}
*pkeylen = keylen;
} else
return gctx;
}
-static int
+static int
genpkey_cb(EVP_PKEY_CTX * ctx)
{
char c = '*';
return 1;
}
-static int
+static int
do_sign_init(BIO * err, EVP_MD_CTX * ctx, EVP_PKEY * pkey,
const EVP_MD * md, STACK_OF(OPENSSL_STRING) * sigopts)
{
return 1;
}
-int
+int
do_X509_sign(BIO * err, X509 * x, EVP_PKEY * pkey, const EVP_MD * md,
STACK_OF(OPENSSL_STRING) * sigopts)
{
}
-int
+int
do_X509_REQ_sign(BIO * err, X509_REQ * x, EVP_PKEY * pkey, const EVP_MD * md,
STACK_OF(OPENSSL_STRING) * sigopts)
{
-int
+int
do_X509_CRL_sign(BIO * err, X509_CRL * x, EVP_PKEY * pkey, const EVP_MD * md,
STACK_OF(OPENSSL_STRING) * sigopts)
{
-/* $OpenBSD: rsa.c,v 1.26 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: rsa.c,v 1.27 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
int rsa_main(int, char **);
-int
+int
rsa_main(int argc, char **argv)
{
ENGINE *e = NULL;
RSA_free(rsa);
free(passin);
free(passout);
-
+
return (ret);
}
-/* $OpenBSD: rsautl.c,v 1.23 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: rsautl.c,v 1.24 2014/07/14 00:35:10 deraadt Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2000.
*/
int rsautl_main(int argc, char **);
-int
+int
rsautl_main(int argc, char **argv)
{
ENGINE *e = NULL;
return ret;
}
-static void
+static void
usage()
{
BIO_printf(bio_err, "Usage: rsautl [options]\n");
-/* $OpenBSD: s_client.c,v 1.68 2014/07/12 19:31:21 jsing Exp $ */
+/* $OpenBSD: s_client.c,v 1.69 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
static int c_ign_eof = 0;
-static void
+static void
sc_usage(void)
{
BIO_printf(bio_err, "usage: s_client args\n");
} tlsextctx;
-static int
+static int
ssl_servername_cb(SSL * s, int *ad, void *arg)
{
tlsextctx *p = (tlsextctx *) arg;
static tlsextnextprotoctx next_proto;
-static int
+static int
next_proto_cb(SSL * s, unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen, void *arg)
{
tlsextnextprotoctx *ctx = arg;
int s_client_main(int, char **);
-int
+int
s_client_main(int argc, char **argv)
{
unsigned int off = 0, clr = 0;
goto bad;
verify_depth = strtonum(*(++argv), 0, INT_MAX, &errstr);
if (errstr)
- goto bad;
+ goto bad;
BIO_printf(bio_err, "verify depth is %d\n", verify_depth);
} else if (strcmp(*argv, "-cert") == 0) {
if (--argc < 1)
BIO_free(bio_c_out);
bio_c_out = NULL;
}
-
+
return (ret);
}
-static void
+static void
print_stuff(BIO * bio, SSL * s, int full)
{
X509 *peer = NULL;
#ifndef OPENSSL_NO_TLSEXT
-static int
+static int
ocsp_resp_cb(SSL * s, void *arg)
{
const unsigned char *p;
-/* $OpenBSD: s_server.c,v 1.60 2014/07/12 19:31:21 jsing Exp $ */
+/* $OpenBSD: s_server.c,v 1.61 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
static void sv_usage(void);
static int init_ssl_connection(SSL * s);
static void print_stats(BIO * bp, SSL_CTX * ctx);
-static int
+static int
generate_session_id(const SSL * ssl, unsigned char *id,
unsigned int *id_len);
#ifndef OPENSSL_NO_DH
-static void
+static void
s_server_init(void)
{
accept_socket = -1;
#endif
}
-static void
+static void
sv_usage(void)
{
BIO_printf(bio_err, "usage: s_server [args ...]\n");
} tlsextctx;
-static int
+static int
ssl_servername_cb(SSL * s, int *ad, void *arg)
{
tlsextctx *p = (tlsextctx *) arg;
* considered "expired".
*/
-static int
+static int
cert_status_cb(SSL * s, void *arg)
{
tlsextstatusctx *srctx = arg;
unsigned int len;
} tlsextnextprotoctx;
-static int
+static int
next_proto_cb(SSL * s, const unsigned char **data, unsigned int *len, void *arg)
{
tlsextnextprotoctx *next_proto = arg;
static char *srtp_profiles = NULL;
#endif
-int
+int
s_server_main(int argc, char *argv[])
{
X509_VERIFY_PARAM *vpm = NULL;
BIO_free(bio_s_out);
bio_s_out = NULL;
}
-
+
return (ret);
}
-static void
+static void
print_stats(BIO * bio, SSL_CTX * ssl_ctx)
{
BIO_printf(bio, "%4ld items in the session cache\n",
SSL_CTX_sess_get_cache_size(ssl_ctx));
}
-static int
+static int
sv_body(char *hostname, int s, unsigned char *context)
{
char *buf = NULL;
return (ret);
}
-static void
+static void
close_accept_socket(void)
{
BIO_printf(bio_err, "shutdown accept socket\n");
}
}
-static int
+static int
init_ssl_connection(SSL * con)
{
int i;
}
#endif
-static int
+static int
www_body(char *hostname, int s, unsigned char *context)
{
char *buf = NULL;
}
#define MAX_SESSION_ID_ATTEMPTS 10
-static int
+static int
generate_session_id(const SSL * ssl, unsigned char *id,
unsigned int *id_len)
{
-/* $OpenBSD: s_time.c,v 1.33 2014/07/12 19:31:21 jsing Exp $ */
+/* $OpenBSD: s_time.c,v 1.34 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
static int perform = 0;
static int t_nbio = 0;
-static void
+static void
s_time_init(void)
{
host = SSL_CONNECT_NAME;
/***********************************************************************
* usage - display usage message
*/
-static void
+static void
s_time_usage(void)
{
static const char umsg[] = "\
*
* Returns 0 if ok, -1 on bad args
*/
-static int
+static int
parseArgs(int argc, char **argv)
{
int badop = 0;
#define START 0
#define STOP 1
-static double
+static double
tm_Time_F(int s)
{
return app_tminterval(s, 1);
*/
int s_time_main(int, char **);
-int
+int
s_time_main(int argc, char **argv)
{
double totalTime = 0.0;
SSL_CTX_free(tm_ctx);
tm_ctx = NULL;
}
-
+
return (ret);
}
-/* $OpenBSD: sess_id.c,v 1.18 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: sess_id.c,v 1.19 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
int sess_id_main(int, char **);
-int
+int
sess_id_main(int argc, char **argv)
{
SSL_SESSION *x = NULL;
BIO_free_all(out);
if (x != NULL)
SSL_SESSION_free(x);
-
+
return (ret);
}
-/* $OpenBSD: smime.c,v 1.27 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: smime.c,v 1.28 2014/07/14 00:35:10 deraadt Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project.
*/
int smime_main(int, char **);
-int
+int
smime_main(int argc, char **argv)
{
ENGINE *e = NULL;
return (ret);
}
-static int
+static int
save_certs(char *signerfile, STACK_OF(X509) * signers)
{
int i;
/* Minimal callback just to output policy info (if any) */
-static int
+static int
smime_cb(int ok, X509_STORE_CTX * ctx)
{
int error;
-/* $OpenBSD: speed.c,v 1.51 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: speed.c,v 1.52 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
static double Time_F(int s);
static void print_message(const char *s, long num, int length);
-static void
+static void
pkey_print_message(const char *str, const char *str2,
long num, int bits, int sec);
static void print_result(int alg, int run_no, int count, double time_used);
#define STOP 1
-static double
+static double
Time_F(int s)
{
return app_tminterval(s, usertime);
int speed_main(int, char **);
-int
+int
speed_main(int argc, char **argv)
{
unsigned char *buf = NULL, *buf2 = NULL;
EC_KEY_free(ecdh_b[i]);
}
-
+
return (mret);
}
-static void
+static void
print_message(const char *s, long num, int length)
{
BIO_printf(bio_err, mr ? "+DT:%s:%d:%d\n"
alarm(SECONDS);
}
-static void
+static void
pkey_print_message(const char *str, const char *str2, long num,
int bits, int tm)
{
alarm(tm);
}
-static void
+static void
print_result(int alg, int run_no, int count, double time_used)
{
BIO_printf(bio_err, mr ? "+R:%d:%s:%f\n"
return token;
}
-static int
+static int
do_multi(int multi)
{
int n;
-/* $OpenBSD: spkac.c,v 1.20 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: spkac.c,v 1.21 2014/07/14 00:35:10 deraadt Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 1999. Based on an original idea by Massimiliano Pala
* (madwolf@openca.org).
int spkac_main(int, char **);
-int
+int
spkac_main(int argc, char **argv)
{
ENGINE *e = NULL;
BIO_free_all(out);
EVP_PKEY_free(pkey);
free(passin);
-
+
return (ret);
}
-/* $OpenBSD: verify.c,v 1.25 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: verify.c,v 1.26 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
sk_X509_pop_free(untrusted, X509_free);
sk_X509_pop_free(trusted, X509_free);
sk_X509_CRL_pop_free(crls, X509_CRL_free);
-
+
return (ret < 0 ? 2 : ret);
}
-/* $OpenBSD: version.c,v 1.17 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: version.c,v 1.18 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
if (dir)
printf("%s\n", SSLeay_version(SSLEAY_DIR));
end:
-
+
return (ret);
}
-/* $OpenBSD: x509.c,v 1.48 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: x509.c,v 1.49 2014/07/14 00:35:10 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
sk_ASN1_OBJECT_pop_free(trust, ASN1_OBJECT_free);
sk_ASN1_OBJECT_pop_free(reject, ASN1_OBJECT_free);
free(passin);
-
+
return (ret);
}
projects / openbsd / commitdiff