| encrypt.c (98884) | encrypt.c (228843) |
|---|---|
| 1/*- 2 * Copyright (c) 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 19 unchanged lines hidden (view full) --- 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 */ 33 34#include <sys/cdefs.h> 35 | 1/*- 2 * Copyright (c) 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 19 unchanged lines hidden (view full) --- 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 */ 33 34#include <sys/cdefs.h> 35 |
| 36__FBSDID("$FreeBSD: head/contrib/telnet/libtelnet/encrypt.c 98884 2002-06-26 17:06:14Z markm $"); | 36__FBSDID("$FreeBSD: head/contrib/telnet/libtelnet/encrypt.c 228843 2011-12-23 15:00:37Z cperciva $"); |
| 37 38#ifndef lint 39#if 0 40static const char sccsid[] = "@(#)encrypt.c 8.2 (Berkeley) 5/30/95"; 41#endif 42#endif /* not lint */ 43 44/* --- 671 unchanged lines hidden (view full) --- 716 717void 718encrypt_keyid(struct key_info *kp, unsigned char *keyid, int len) 719{ 720 Encryptions *ep; 721 int dir = kp->dir; 722 int ret = 0; 723 | 37 38#ifndef lint 39#if 0 40static const char sccsid[] = "@(#)encrypt.c 8.2 (Berkeley) 5/30/95"; 41#endif 42#endif /* not lint */ 43 44/* --- 671 unchanged lines hidden (view full) --- 716 717void 718encrypt_keyid(struct key_info *kp, unsigned char *keyid, int len) 719{ 720 Encryptions *ep; 721 int dir = kp->dir; 722 int ret = 0; 723 |
| 724 if (len > MAXKEYLEN) 725 len = MAXKEYLEN; 726 |
|
| 724 if (!(ep = (*kp->getcrypt)(*kp->modep))) { 725 if (len == 0) 726 return; 727 kp->keylen = 0; 728 } else if (len == 0) { 729 /* 730 * Empty option, indicates a failure. 731 */ --- 222 unchanged lines hidden --- | 727 if (!(ep = (*kp->getcrypt)(*kp->modep))) { 728 if (len == 0) 729 return; 730 kp->keylen = 0; 731 } else if (len == 0) { 732 /* 733 * Empty option, indicates a failure. 734 */ --- 222 unchanged lines hidden --- |