/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
*
- * Licensed under the OpenSSL license (the "License"). You may not use
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
#include <stdlib.h>
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/x509.h>
OPT_TEXT, OPT_CERT, OPT_NOOUT, OPT_CONTEXT
} OPTION_CHOICE;
-OPTIONS sess_id_options[] = {
+const OPTIONS sess_id_options[] = {
+ OPT_SECTION("General"),
{"help", OPT_HELP, '-', "Display this summary"},
+ {"context", OPT_CONTEXT, 's', "Set the session ID context"},
+
+ OPT_SECTION("Input"),
+ {"in", OPT_IN, 's', "Input file - default stdin"},
{"inform", OPT_INFORM, 'F', "Input format - default PEM (DER or PEM)"},
+
+ OPT_SECTION("Output"),
+ {"out", OPT_OUT, '>', "Output file - default stdout"},
{"outform", OPT_OUTFORM, 'f',
"Output format - default PEM (PEM, DER or NSS)"},
- {"in", OPT_IN, 's', "Input file - default stdin"},
- {"out", OPT_OUT, 's', "Output file - default stdout"},
{"text", OPT_TEXT, '-', "Print ssl session id details"},
{"cert", OPT_CERT, '-', "Output certificate "},
{"noout", OPT_NOOUT, '-', "Don't output the encoded session info"},
- {"context", OPT_CONTEXT, 's', "Set the session ID context"},
{NULL}
};
}
peer = SSL_SESSION_get0_peer(x);
- if (context) {
+ if (context != NULL) {
size_t ctx_len = strlen(context);
if (ctx_len > SSL_MAX_SID_CTX_LENGTH) {
BIO_printf(bio_err, "Context too long\n");
goto end;
}
if (!SSL_SESSION_set1_id_context(x, (unsigned char *)context,
- ctx_len)) {
+ ctx_len)) {
BIO_printf(bio_err, "Error setting id context\n");
goto end;
}
}
if (!noout && !cert) {
- if (outformat == FORMAT_ASN1)
+ if (outformat == FORMAT_ASN1) {
i = i2d_SSL_SESSION_bio(out, x);
- else if (outformat == FORMAT_PEM)
+ } else if (outformat == FORMAT_PEM) {
i = PEM_write_bio_SSL_SESSION(out, x);
- else if (outformat == FORMAT_NSS)
+ } else if (outformat == FORMAT_NSS) {
i = SSL_SESSION_print_keylog(out, x);
- else {
+ } else {
BIO_printf(bio_err, "bad output format specified for outfile\n");
goto end;
}
goto end;
}
} else if (!noout && (peer != NULL)) { /* just print the certificate */
- if (outformat == FORMAT_ASN1)
+ if (outformat == FORMAT_ASN1) {
i = (int)i2d_X509_bio(out, peer);
- else if (outformat == FORMAT_PEM)
+ } else if (outformat == FORMAT_PEM) {
i = PEM_write_bio_X509(out, peer);
- else {
+ } else {
BIO_printf(bio_err, "bad output format specified for outfile\n");
goto end;
}
end:
BIO_free_all(out);
SSL_SESSION_free(x);
- return (ret);
+ return ret;
}
static SSL_SESSION *load_sess_id(char *infile, int format)
end:
BIO_free(in);
- return (x);
+ return x;
}