1667 pkcs11 may deadlock when multi-threaded consumers fork

*** 20,29 ****
--- 20,30 ----
   *
   * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
   */
  /*
   * Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
+  * Copyright 2014, OmniTI Computer Consulting, Inc. All rights reserved.
   */
  
  #ifndef _CRYPTOUTIL_H
  #define _CRYPTOUTIL_H
  
*** 214,226 ****
  
  extern int pkcs11_seed_urandom(void *sbuf, size_t slen);
  extern int pkcs11_get_random(void *dbuf, size_t dlen);
  extern int pkcs11_get_urandom(void *dbuf, size_t dlen);
  extern int pkcs11_get_nzero_urandom(void *dbuf, size_t dlen);
- extern void pkcs11_close_random(void);
- extern void pkcs11_close_urandom(void);
- extern void pkcs11_close_urandom_seed(void);
  extern int pkcs11_read_data(char *filename, void **dbuf, size_t *dlen);
  
  extern int open_nointr(const char *path, int oflag, ...);
  extern ssize_t readn_nointr(int fd, void *dbuf, size_t dlen);
  extern ssize_t writen_nointr(int fd, void *dbuf, size_t dlen);
--- 215,224 ----