Restoring authorship annotation for <tpashkin@yandex-team.ru>. Commit 1 of 2.

1 files changed, 24 insertions, 24 deletions

diff --git a/contrib/libs/openssl/apps/ts.c b/contrib/libs/openssl/apps/ts.c
index 66a0c810e0..92a5163bb7 100644
--- a/contrib/libs/openssl/apps/ts.c
+++ b/contrib/libs/openssl/apps/ts.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved. 
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -8,26 +8,26 @@
  */
 
 #include <openssl/opensslconf.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "apps.h"
-#include "progs.h"
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#include <openssl/pem.h>
-#include <openssl/rand.h>
-#include <openssl/ts.h>
-#include <openssl/bn.h>
+#include <stdio.h> 
+#include <stdlib.h> 
+#include <string.h> 
+#include "apps.h" 
+#include "progs.h" 
+#include <openssl/bio.h> 
+#include <openssl/err.h> 
+#include <openssl/pem.h> 
+#include <openssl/rand.h> 
+#include <openssl/ts.h> 
+#include <openssl/bn.h> 
 
 /* Request nonce length, in bits (must be a multiple of 8). */
-#define NONCE_LENGTH            64
+#define NONCE_LENGTH            64 
 
 /* Name of config entry that defines the OID file. */
-#define ENV_OID_FILE            "oid_file"
+#define ENV_OID_FILE            "oid_file" 
 
 /* Is |EXACTLY_ONE| of three pointers set? */
-#define EXACTLY_ONE(a, b, c) \
+#define EXACTLY_ONE(a, b, c) \ 
         (( a && !b && !c) || \
          ( b && !a && !c) || \
          ( c && !a && !b))
@@ -111,9 +111,9 @@ const OPTIONS ts_options[] = {
     {"CAfile", OPT_CAFILE, '<', "File with trusted CA certs"},
     {"untrusted", OPT_UNTRUSTED, '<', "File with untrusted certs"},
     {"", OPT_MD, '-', "Any supported digest"},
-#ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE 
     {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
-#endif
+#endif 
     {OPT_HELP_STR, 1, '-', "\nOptions specific to 'ts -verify': \n"},
     OPT_V_OPTIONS,
     {OPT_HELP_STR, 1, '-', "\n"},
@@ -134,11 +134,11 @@ static char* opt_helplist[] = {
     "          [-signer tsa_cert.pem] [-inkey private_key.pem]",
     "          [-chain certs_file.pem] [-tspolicy oid]",
     "          [-in file] [-token_in] [-out file] [-token_out]",
-#ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE 
     "          [-text] [-engine id]",
-#else
+#else 
     "          [-text]",
-#endif
+#endif 
     "  or",
     "ts -verify -CApath dir -CAfile file.pem -untrusted file.pem",
     "           [-data file] [-digest hexstring]",
@@ -279,8 +279,8 @@ int ts_main(int argc, char **argv)
         goto end;
     }
 
-    if ((conf = load_config_file(configfile)) == NULL)
-        goto end;
+    if ((conf = load_config_file(configfile)) == NULL) 
+        goto end; 
     if (configfile != default_config_file && !app_load_modules(conf))
         goto end;
 
@@ -679,10 +679,10 @@ static TS_RESP *create_response(CONF *conf, const char *section, const char *eng
         goto end;
     if (!TS_CONF_set_serial(conf, section, serial_cb, resp_ctx))
         goto end;
-#ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE 
     if (!TS_CONF_set_crypto_device(conf, section, engine))
         goto end;
-#endif
+#endif 
     if (!TS_CONF_set_signer_cert(conf, section, signer, resp_ctx))
         goto end;
     if (!TS_CONF_set_certs(conf, section, chain, resp_ctx))