summaryrefslogtreecommitdiff
path: root/cipher-3des1.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2015-01-14 10:24:42 +0000
committerDamien Miller <djm@mindrot.org>2015-01-14 21:32:54 +1100
commit60c2c4ea5e1ad0ddfe8b2877b78ed5143be79c53 (patch)
tree55c765df3aed7aedbdd5bcd2a4d3d82e71280820 /cipher-3des1.c
parent128343bcdb0b60fc826f2733df8cf979ec1627b4 (diff)
upstream commit
remove unneeded includes, sync my copyright across files & whitespace; ok djm@
Diffstat (limited to 'cipher-3des1.c')
-rw-r--r--cipher-3des1.c21
1 files changed, 6 insertions, 15 deletions
diff --git a/cipher-3des1.c b/cipher-3des1.c
index 2753f9a0e..6a0f1f37b 100644
--- a/cipher-3des1.c
+++ b/cipher-3des1.c
@@ -1,15 +1,10 @@
1/* $OpenBSD: cipher-3des1.c,v 1.11 2014/07/02 04:59:06 djm Exp $ */ 1/* $OpenBSD: cipher-3des1.c,v 1.12 2015/01/14 10:24:42 markus Exp $ */
2/* 2/*
3 * Copyright (c) 2003 Markus Friedl. All rights reserved. 3 * Copyright (c) 2003 Markus Friedl. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Permission to use, copy, modify, and distribute this software for any
6 * modification, are permitted provided that the following conditions 6 * purpose with or without fee is hereby granted, provided that the above
7 * are met: 7 * copyright notice and this permission notice appear in all copies.
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * 8 *
14 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 9 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
15 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 10 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -26,13 +21,9 @@
26#include "includes.h" 21#include "includes.h"
27 22
28#include <sys/types.h> 23#include <sys/types.h>
29
30#include <openssl/evp.h>
31
32#include <string.h> 24#include <string.h>
25#include <openssl/evp.h>
33 26
34#include "xmalloc.h"
35#include "log.h"
36#include "ssherr.h" 27#include "ssherr.h"
37 28
38/* 29/*
@@ -151,7 +142,7 @@ evp_ssh1_3des(void)
151{ 142{
152 static EVP_CIPHER ssh1_3des; 143 static EVP_CIPHER ssh1_3des;
153 144
154 memset(&ssh1_3des, 0, sizeof(EVP_CIPHER)); 145 memset(&ssh1_3des, 0, sizeof(ssh1_3des));
155 ssh1_3des.nid = NID_undef; 146 ssh1_3des.nid = NID_undef;
156 ssh1_3des.block_size = 8; 147 ssh1_3des.block_size = 8;
157 ssh1_3des.iv_len = 0; 148 ssh1_3des.iv_len = 0;