summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/des
diff options
context:
space:
mode:
authormiod <>2015-02-10 09:46:30 +0000
committermiod <>2015-02-10 09:46:30 +0000
commitc54f1e6efb3beda80d415ba75614cbc695f799be (patch)
tree8bb4657eb5417a2a0ea6710585ef13aa7b25433c /src/lib/libcrypto/des
parentbedef42af36243e74221aa77e809718c15fae035 (diff)
downloadopenbsd-c54f1e6efb3beda80d415ba75614cbc695f799be.tar.gz
openbsd-c54f1e6efb3beda80d415ba75614cbc695f799be.tar.bz2
openbsd-c54f1e6efb3beda80d415ba75614cbc695f799be.zip
Remove assert() or OPENSSL_assert() of pointers being non-NULL. The policy
for libraries in OpenBSD is to deliberately let NULL pointers cause a SIGSEGV. ok doug@ jsing@
Diffstat (limited to 'src/lib/libcrypto/des')
-rw-r--r--src/lib/libcrypto/des/cfb_enc.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/lib/libcrypto/des/cfb_enc.c b/src/lib/libcrypto/des/cfb_enc.c
index d654a6a8e2..59a3e71862 100644
--- a/src/lib/libcrypto/des/cfb_enc.c
+++ b/src/lib/libcrypto/des/cfb_enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cfb_enc.c,v 1.12 2014/10/28 07:35:58 jsg Exp $ */ 1/* $OpenBSD: cfb_enc.c,v 1.13 2015/02/10 09:46:30 miod Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -57,7 +57,6 @@
57 */ 57 */
58 58
59#include "des_locl.h" 59#include "des_locl.h"
60#include <assert.h>
61#include <machine/endian.h> 60#include <machine/endian.h>
62 61
63/* The input and output are loaded in multiples of 8 bits. 62/* The input and output are loaded in multiples of 8 bits.
@@ -82,11 +81,6 @@ void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
82#else 81#else
83 unsigned int sh[4]; 82 unsigned int sh[4];
84 unsigned char *ovec=(unsigned char *)sh; 83 unsigned char *ovec=(unsigned char *)sh;
85
86 /* I kind of count that compiler optimizes away this assertioni,*/
87 assert (sizeof(sh[0])==4); /* as this holds true for all, */
88 /* but 16-bit platforms... */
89
90#endif 84#endif
91 85
92 if (numbits<=0 || numbits > 64) return; 86 if (numbits<=0 || numbits > 64) return;