===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/apps.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -c -r1.26 -r1.27
*** src/usr.bin/openssl/apps.c	2015/06/16 02:27:24	1.26
--- src/usr.bin/openssl/apps.c	2015/06/19 07:18:58	1.27
***************
*** 1,4 ****
! /* $OpenBSD: apps.c,v 1.26 2015/06/16 02:27:24 doug Exp $ */
  /*
   * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
   *
--- 1,4 ----
! /* $OpenBSD: apps.c,v 1.27 2015/06/19 07:18:58 bcook Exp $ */
  /*
   * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
   *
***************
*** 1251,1272 ****
  }
  
  #ifndef OPENSSL_NO_ENGINE
- /* Try to load an engine in a shareable library */
- static ENGINE *
- try_load_engine(BIO *err, const char *engine, int debug)
- {
- 	ENGINE *e = ENGINE_by_id("dynamic");
  
- 	if (e) {
- 		if (!ENGINE_ctrl_cmd_string(e, "SO_PATH", engine, 0) ||
- 		    !ENGINE_ctrl_cmd_string(e, "LOAD", NULL, 0)) {
- 			ENGINE_free(e);
- 			e = NULL;
- 		}
- 	}
- 	return e;
- }
- 
  ENGINE *
  setup_engine(BIO *err, const char *engine, int debug)
  {
--- 1251,1257 ----
***************
*** 1278,1285 ****
  			ENGINE_register_all_complete();
  			return NULL;
  		}
! 		if ((e = ENGINE_by_id(engine)) == NULL &&
! 		    (e = try_load_engine(err, engine, debug)) == NULL) {
  			BIO_printf(err, "invalid engine \"%s\"\n", engine);
  			ERR_print_errors(err);
  			return NULL;
--- 1263,1269 ----
  			ENGINE_register_all_complete();
  			return NULL;
  		}
! 		if ((e = ENGINE_by_id(engine)) == NULL) {
  			BIO_printf(err, "invalid engine \"%s\"\n", engine);
  			ERR_print_errors(err);
  			return NULL;