===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/encrypt/encrypt.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -c -r1.42 -r1.43
*** src/usr.bin/encrypt/encrypt.c	2015/10/10 18:14:20	1.42
--- src/usr.bin/encrypt/encrypt.c	2016/09/02 17:06:59	1.43
***************
*** 1,4 ****
! /*	$OpenBSD: encrypt.c,v 1.42 2015/10/10 18:14:20 doug Exp $	*/
  
  /*
   * Copyright (c) 1996, Jason Downs.  All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: encrypt.c,v 1.43 2016/09/02 17:06:59 tedu Exp $	*/
  
  /*
   * Copyright (c) 1996, Jason Downs.  All rights reserved.
***************
*** 36,41 ****
--- 36,42 ----
  #include <unistd.h>
  #include <login_cap.h>
  #include <limits.h>
+ #include <readpassphrase.h>
  
  /*
   * Very simple little program, for encrypting passwords from the command
***************
*** 123,133 ****
  	}
  
  	if (((argc - optind) < 1)) {
! 		char line[BUFSIZ], *string;
  
  		if (prompt) {
! 			if ((string = getpass("Enter string: ")) == NULL)
! 				err(1, "getpass");
  			print_passwd(string, operation, extra);
  			(void)fputc('\n', stdout);
  		} else {
--- 124,136 ----
  	}
  
  	if (((argc - optind) < 1)) {
! 		char line[BUFSIZ];
! 		char string[_PASSWORD_LEN + 1];
  
  		if (prompt) {
! 			if (readpassphrase("Enter string: ", string,
! 			    sizeof(string), RPP_ECHO_OFF) == NULL)
! 				err(1, "readpassphrase");
  			print_passwd(string, operation, extra);
  			(void)fputc('\n', stdout);
  		} else {