===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/nc/netcat.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -c -r1.149 -r1.150
*** src/usr.bin/nc/netcat.c	2015/12/28 14:17:47	1.149
--- src/usr.bin/nc/netcat.c	2016/01/04 02:18:31	1.150
***************
*** 1,4 ****
! /* $OpenBSD: netcat.c,v 1.149 2015/12/28 14:17:47 bcook Exp $ */
  /*
   * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
   * Copyright (c) 2015 Bob Beck.  All rights reserved.
--- 1,4 ----
! /* $OpenBSD: netcat.c,v 1.150 2016/01/04 02:18:31 bcook Exp $ */
  /*
   * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
   * Copyright (c) 2015 Bob Beck.  All rights reserved.
***************
*** 427,437 ****
  	}
  
  	if (usetls) {
! 		if (Rflag && (cacert=tls_load_file(Rflag, &cacertlen, NULL)) == NULL)
  			errx(1, "unable to load root CA file %s", Rflag);
! 		if (Cflag && (pubcert=tls_load_file(Rflag, &pubcertlen, NULL)) == NULL)
  			errx(1, "unable to load TLS certificate file %s", Cflag);
! 		if (Kflag && (privkey=tls_load_file(Rflag, &privkeylen, NULL)) == NULL)
  			errx(1, "unable to load TLS key file %s", Kflag);
  
  		if (pledge("stdio inet dns", NULL) == -1)
--- 427,437 ----
  	}
  
  	if (usetls) {
! 		if (Rflag && (cacert = tls_load_file(Rflag, &cacertlen, NULL)) == NULL)
  			errx(1, "unable to load root CA file %s", Rflag);
! 		if (Cflag && (pubcert = tls_load_file(Cflag, &pubcertlen, NULL)) == NULL)
  			errx(1, "unable to load TLS certificate file %s", Cflag);
! 		if (Kflag && (privkey = tls_load_file(Kflag, &privkeylen, NULL)) == NULL)
  			errx(1, "unable to load TLS key file %s", Kflag);
  
  		if (pledge("stdio inet dns", NULL) == -1)
***************
*** 443,449 ****
  			errx(1, "unable to allocate TLS config");
  		if (Rflag && tls_config_set_ca_mem(tls_cfg, cacert, cacertlen) == -1)
  			errx(1, "unable to set root CA file %s", Rflag);
! 		if (Cflag && tls_config_set_cert_mem(tls_cfg, cacert, cacertlen) == -1)
  			errx(1, "unable to set TLS certificate file %s", Cflag);
  		if (Kflag && tls_config_set_key_mem(tls_cfg, privkey, privkeylen) == -1)
  			errx(1, "unable to set TLS key file %s", Kflag);
--- 443,449 ----
  			errx(1, "unable to allocate TLS config");
  		if (Rflag && tls_config_set_ca_mem(tls_cfg, cacert, cacertlen) == -1)
  			errx(1, "unable to set root CA file %s", Rflag);
! 		if (Cflag && tls_config_set_cert_mem(tls_cfg, pubcert, pubcertlen) == -1)
  			errx(1, "unable to set TLS certificate file %s", Cflag);
  		if (Kflag && tls_config_set_key_mem(tls_cfg, privkey, privkeylen) == -1)
  			errx(1, "unable to set TLS key file %s", Kflag);