Locking issues.

[openssl.git] / apps / openssl.c

diff --git a/apps/openssl.c b/apps/openssl.c
index 4ec9606a060d351acf1aeb1c760434b7f7e788dc..6c69a29bd66cb28b505853ebda7055d7eac79a0b 100644 (file)
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -55,6 +55,60 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
+/* ====================================================================
+ * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
 
 #include <stdio.h>
 #include <string.h>
@@ -92,6 +146,71 @@ char *default_config_file=NULL;
 BIO *bio_err=NULL;
 #endif
 
+
+static void lock_dbg_cb(int mode, int type, const char *file, int line)
+       {
+       static int modes[CRYPTO_NUM_LOCKS]; /* = {0, 0, ... } */
+       const char *errstr = NULL;
+       int rw;
+       
+       rw = mode & (CRYPTO_READ|CRYPTO_WRITE);
+       if (!((rw == CRYPTO_READ) || (rw == CRYPTO_WRITE)))
+               {
+               errstr = "invalid mode";
+               goto err;
+               }
+
+       if (type < 0 || type > CRYPTO_NUM_LOCKS)
+               {
+               errstr = "type out of bounds";
+               goto err;
+               }
+
+       if (mode & CRYPTO_LOCK)
+               {
+               if (modes[type])
+                       {
+                       errstr = "already locked";
+                       /* must not happen in a single-threaded program
+                        * (would deadlock) */
+                       goto err;
+                       }
+
+               modes[type] = rw;
+               }
+       else if (mode & CRYPTO_UNLOCK)
+               {
+               if (!modes[type])
+                       {
+                       errstr = "not locked";
+                       goto err;
+                       }
+               
+               if (modes[type] != rw)
+                       {
+                       errstr = (rw == CRYPTO_READ) ?
+                               "CRYPTO_r_unlock on write lock" :
+                               "CRYPTO_w_unlock on read lock";
+                       }
+
+               modes[type] = 0;
+               }
+       else
+               {
+               errstr = "invalid mode";
+               goto err;
+               }
+
+ err:
+       if (errstr)
+               {
+               /* we cannot use bio_err here */
+               fprintf(stderr, "openssl (lock_dbg_cb): %s (mode=%d, type=%d) at %s:%d\n",
+                       errstr, mode, type, file, line);
+               }
+       }
+
+
 int main(int Argc, char *Argv[])
        {
        ARGS arg;
@@ -112,6 +231,13 @@ int main(int Argc, char *Argv[])
                CRYPTO_malloc_debug_init();
        CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
 
+#if 0
+       if (getenv("OPENSSL_DEBUG_LOCKING") != NULL)
+#endif
+               {
+               CRYPTO_set_locking_callback(lock_dbg_cb);
+               }
+
        apps_startup();
 
        if (bio_err == NULL)