Commit 5aba2b6e authored by Pauli's avatar Pauli Committed by Tim Hudson
Browse files

Correct Oracle copyrights & clarify. 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3684)
parent 594da712

crypto/aria/aria.c

+1 −4
Original line number Diff line number Diff line 
/*

 * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright (c) 2017, Oracle and/or its affiliates.  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
@@ -17,10 +18,6 @@ 
 * Public domain version is distributed above.

 */



/* ====================================================================

 * Copyright (c) 2017 Oracle and/or its affiliates.  All rights reserved.

 */



#include <openssl/e_os2.h>

#include "internal/aria.h"

crypto/evp/e_aria.c

+1 −4
Original line number Diff line number Diff line 
/*

 * Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright (c) 2017, Oracle and/or its affiliates.  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
@@ -7,10 +8,6 @@ 
 * https://www.openssl.org/source/license.html

 */



/* ====================================================================

 * Copyright (c) 2017 Oracle and/or its affiliates.  All rights reserved.

 */



#include "internal/cryptlib.h"

#ifndef OPENSSL_NO_ARIA

# include <openssl/evp.h>

crypto/include/internal/aria.h

+1 −4
Original line number Diff line number Diff line 
/*

 * Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright (c) 2017, Oracle and/or its affiliates.  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
@@ -7,10 +8,6 @@ 
 * https://www.openssl.org/source/license.html

 */



/* ====================================================================

 * Copyright (c) 2017 Oracle and/or its affiliates.  All rights reserved.

 */



 /* Copyright (c) 2017 National Security Resarch Institute.  All rights reserved. */



#ifndef HEADER_ARIA_H

test/lhash_test.c

+1 −4
Original line number Diff line number Diff line 
/*

 * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright (c) 2017, Oracle and/or its affiliates.  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
@@ -7,10 +8,6 @@ 
 * https://www.openssl.org/source/license.html

 */



/*

 * Copyright (c) 2017 Oracle and/or its affiliates.  All rights reserved.

 */



#include <stdio.h>

#include <string.h>

test/recipes/01-test_test.t

+1 −3
Original line number Diff line number Diff line 
#! /usr/bin/env perl

# Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.

# Copyright (c) 2017, Oracle and/or its affiliates.  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

# in the file LICENSE in the source distribution or at

# https://www.openssl.org/source/license.html

#

# ======================================================================

# Copyright (c) 2017 Oracle and/or its affiliates.  All rights reserved.



use OpenSSL::Test::Simple;