summaryrefslogtreecommitdiffstats
path: root/crypto/mem_sec.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2017-06-15 12:03:40 -0400
committerRich Salz <rsalz@openssl.org>2017-06-30 21:56:44 -0400
commit624265c60e07f8e5f251d0f5b79e34cf0221af73 (patch)
tree8581cdb5a67fc2ab3b2c2233e112932788d16e96 /crypto/mem_sec.c
parent1297ef9928e0b77b1ca81b5aafa47f5b25c247a7 (diff)
Cleanup some copyright stuff
Remove some incorrect copyright references. Move copyright to standard place Add OpenSSL copyright where missing. Remove copyrighted file that we don't use any more Remove Itanium assembler for RC4 and MD5 (assembler versions of old and weak algorithms for an old chip) Standardize apps/rehash copyright comment; approved by Timo Put dual-copyright notice on mkcert Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3691)
Diffstat (limited to 'crypto/mem_sec.c')
-rw-r--r--crypto/mem_sec.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index 6fc1aca1e0..11e95c42b8 100644
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -1,5 +1,6 @@
/*
* Copyright 2015-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2014, Akamai Technologies. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -8,11 +9,6 @@
*/
/*
- * Copyright 2004-2014, Akamai Technologies. All Rights Reserved.
- * This file is distributed under the terms of the OpenSSL license.
- */
-
-/*
* This file is in two halves. The first half implements the public API
* to be used by external consumers, and to be used by OpenSSL to store
* data in a "secure arena." The second half implements the secure arena.