summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/sha
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/sha')
-rw-r--r--src/lib/libcrypto/sha/sha1dgst.c4
-rw-r--r--src/lib/libcrypto/sha/sha256.c4
-rw-r--r--src/lib/libcrypto/sha/sha512.c4
-rw-r--r--src/lib/libcrypto/sha/sha_dgst.c4
4 files changed, 4 insertions, 12 deletions
diff --git a/src/lib/libcrypto/sha/sha1dgst.c b/src/lib/libcrypto/sha/sha1dgst.c
index 08c20ec806..94fabddd83 100644
--- a/src/lib/libcrypto/sha/sha1dgst.c
+++ b/src/lib/libcrypto/sha/sha1dgst.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sha1dgst.c,v 1.11 2014/06/12 15:49:30 deraadt Exp $ */ 1/* $OpenBSD: sha1dgst.c,v 1.12 2014/07/09 11:10:51 bcook 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 *
@@ -65,8 +65,6 @@
65 65
66#include <openssl/opensslv.h> 66#include <openssl/opensslv.h>
67 67
68const char SHA1_version[]="SHA1" OPENSSL_VERSION_PTEXT;
69
70/* The implementation is in ../md32_common.h */ 68/* The implementation is in ../md32_common.h */
71 69
72#include "sha_locl.h" 70#include "sha_locl.h"
diff --git a/src/lib/libcrypto/sha/sha256.c b/src/lib/libcrypto/sha/sha256.c
index f008724c0e..b623893be4 100644
--- a/src/lib/libcrypto/sha/sha256.c
+++ b/src/lib/libcrypto/sha/sha256.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sha256.c,v 1.4 2014/06/12 15:49:30 deraadt Exp $ */ 1/* $OpenBSD: sha256.c,v 1.5 2014/07/09 11:10:51 bcook Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2004 The OpenSSL Project. All rights reserved 3 * Copyright (c) 2004 The OpenSSL Project. All rights reserved
4 * according to the OpenSSL license [found in ../../LICENSE]. 4 * according to the OpenSSL license [found in ../../LICENSE].
@@ -15,8 +15,6 @@
15#include <openssl/sha.h> 15#include <openssl/sha.h>
16#include <openssl/opensslv.h> 16#include <openssl/opensslv.h>
17 17
18const char SHA256_version[]="SHA-256" OPENSSL_VERSION_PTEXT;
19
20int SHA224_Init(SHA256_CTX *c) 18int SHA224_Init(SHA256_CTX *c)
21 { 19 {
22 memset (c,0,sizeof(*c)); 20 memset (c,0,sizeof(*c));
diff --git a/src/lib/libcrypto/sha/sha512.c b/src/lib/libcrypto/sha/sha512.c
index 5bc679680b..08b1564363 100644
--- a/src/lib/libcrypto/sha/sha512.c
+++ b/src/lib/libcrypto/sha/sha512.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sha512.c,v 1.9 2014/06/12 15:49:30 deraadt Exp $ */ 1/* $OpenBSD: sha512.c,v 1.10 2014/07/09 11:10:51 bcook Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2004 The OpenSSL Project. All rights reserved 3 * Copyright (c) 2004 The OpenSSL Project. All rights reserved
4 * according to the OpenSSL license [found in ../../LICENSE]. 4 * according to the OpenSSL license [found in ../../LICENSE].
@@ -51,8 +51,6 @@
51 51
52#include "cryptlib.h" 52#include "cryptlib.h"
53 53
54const char SHA512_version[]="SHA-512" OPENSSL_VERSION_PTEXT;
55
56#if !defined(__STRICT_ALIGNMENT) || defined(SHA512_ASM) 54#if !defined(__STRICT_ALIGNMENT) || defined(SHA512_ASM)
57#define SHA512_BLOCK_CAN_MANAGE_UNALIGNED_DATA 55#define SHA512_BLOCK_CAN_MANAGE_UNALIGNED_DATA
58#endif 56#endif
diff --git a/src/lib/libcrypto/sha/sha_dgst.c b/src/lib/libcrypto/sha/sha_dgst.c
index 5a88d2573d..a255450977 100644
--- a/src/lib/libcrypto/sha/sha_dgst.c
+++ b/src/lib/libcrypto/sha/sha_dgst.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sha_dgst.c,v 1.10 2014/06/12 15:49:30 deraadt Exp $ */ 1/* $OpenBSD: sha_dgst.c,v 1.11 2014/07/09 11:10:51 bcook 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 *
@@ -65,8 +65,6 @@
65 65
66#include <openssl/opensslv.h> 66#include <openssl/opensslv.h>
67 67
68const char SHA_version[]="SHA" OPENSSL_VERSION_PTEXT;
69
70/* The implementation is in ../md32_common.h */ 68/* The implementation is in ../md32_common.h */
71 69
72#include "sha_locl.h" 70#include "sha_locl.h"