Add -reqin_new_tid option to apps/cmp.c and OSSL_CMP_MSG_update_transactionID()

[openssl.git] / apps / sess_id.c

diff --git a/apps/sess_id.c b/apps/sess_id.c
index b9f249e5accc431e0126bd3ab6e877967f16c960..5183ea93edc29784b30120e825bbfbf1852737c6 100644 (file)
--- a/apps/sess_id.c
+++ b/apps/sess_id.c
@@ -1,7 +1,7 @@
 /*
- * Copyright 1995-2017 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
@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
+#include "progs.h"
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/x509.h>
@@ -24,16 +25,21 @@ typedef enum OPTION_choice {
 } OPTION_CHOICE;
 
 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}
 };
 
@@ -163,7 +169,7 @@ int sess_id_main(int argc, char **argv)
  end:
     BIO_free_all(out);
     SSL_SESSION_free(x);
-    return (ret);
+    return ret;
 }
 
 static SSL_SESSION *load_sess_id(char *infile, int format)
@@ -186,5 +192,5 @@ static SSL_SESSION *load_sess_id(char *infile, int format)
 
  end:
     BIO_free(in);
-    return (x);
+    return x;
 }