Skip to content

Commit 6a12f17

Browse files
davidbenBoringssl LUCI CQ
authored and
Boringssl LUCI CQ
committed
Fix objects.go generator to reflect new header
This allows the script to recreate the new header. Bug: 364634028 Change-Id: Ie399e95f284b0170e8073e60f71806bf16cf48e2 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/74711 Reviewed-by: Adam Langley <[email protected]> Commit-Queue: David Benjamin <[email protected]>
1 parent 4854ec1 commit 6a12f17

File tree

1 file changed

+14
-108
lines changed

1 file changed

+14
-108
lines changed

crypto/obj/objects.go

+14-108
Original file line numberDiff line numberDiff line change
@@ -388,61 +388,14 @@ func clangFormat(input string) (string, error) {
388388

389389
func writeHeader(path string, objs *objects) error {
390390
var b bytes.Buffer
391-
fmt.Fprintf(&b, `/* Copyright (C) 1995-1997 Eric Young ([email protected])
392-
* All rights reserved.
391+
fmt.Fprintf(&b, `/*
392+
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
393393
*
394-
* This package is an SSL implementation written
395-
* by Eric Young ([email protected]).
396-
* The implementation was written so as to conform with Netscapes SSL.
397-
*
398-
* This library is free for commercial and non-commercial use as long as
399-
* the following conditions are aheared to. The following conditions
400-
* apply to all code found in this distribution, be it the RC4, RSA,
401-
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
402-
* included with this distribution is covered by the same copyright terms
403-
* except that the holder is Tim Hudson ([email protected]).
404-
*
405-
* Copyright remains Eric Young's, and as such any Copyright notices in
406-
* the code are not to be removed.
407-
* If this package is used in a product, Eric Young should be given attribution
408-
* as the author of the parts of the library used.
409-
* This can be in the form of a textual message at program startup or
410-
* in documentation (online or textual) provided with the package.
411-
*
412-
* Redistribution and use in source and binary forms, with or without
413-
* modification, are permitted provided that the following conditions
414-
* are met:
415-
* 1. Redistributions of source code must retain the copyright
416-
* notice, this list of conditions and the following disclaimer.
417-
* 2. Redistributions in binary form must reproduce the above copyright
418-
* notice, this list of conditions and the following disclaimer in the
419-
* documentation and/or other materials provided with the distribution.
420-
* 3. All advertising materials mentioning features or use of this software
421-
* must display the following acknowledgement:
422-
* "This product includes cryptographic software written by
423-
* Eric Young ([email protected])"
424-
* The word 'cryptographic' can be left out if the rouines from the library
425-
* being used are not cryptographic related :-).
426-
* 4. If you include any Windows specific code (or a derivative thereof) from
427-
* the apps directory (application code) you must include an acknowledgement:
428-
* "This product includes software written by Tim Hudson ([email protected])"
429-
*
430-
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG `+"``"+`AS IS'' AND
431-
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
432-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
433-
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
434-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
435-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
436-
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
437-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
438-
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
439-
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
440-
* SUCH DAMAGE.
441-
*
442-
* The licence and distribution terms for any publically available version or
443-
* derivative of this code cannot be changed. i.e. this code cannot simply be
444-
* copied and put under another distribution licence
445-
* [including the GNU Public Licence.] */
394+
* Licensed under the OpenSSL license (the "License"). You may not use
395+
* this file except in compliance with the License. You can obtain a copy
396+
* in the file LICENSE in the source distribution or at
397+
* https://www.openssl.org/source/license.html
398+
*/
446399
447400
/* This file is generated by crypto/obj/objects.go. */
448401
@@ -528,61 +481,14 @@ func sortNIDs(nids []int, objs *objects, cmp func(a, b object) bool) {
528481

529482
func writeData(path string, objs *objects) error {
530483
var b bytes.Buffer
531-
fmt.Fprintf(&b, `/* Copyright (C) 1995-1997 Eric Young ([email protected])
532-
* All rights reserved.
533-
*
534-
* This package is an SSL implementation written
535-
* by Eric Young ([email protected]).
536-
* The implementation was written so as to conform with Netscapes SSL.
537-
*
538-
* This library is free for commercial and non-commercial use as long as
539-
* the following conditions are aheared to. The following conditions
540-
* apply to all code found in this distribution, be it the RC4, RSA,
541-
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
542-
* included with this distribution is covered by the same copyright terms
543-
* except that the holder is Tim Hudson ([email protected]).
544-
*
545-
* Copyright remains Eric Young's, and as such any Copyright notices in
546-
* the code are not to be removed.
547-
* If this package is used in a product, Eric Young should be given attribution
548-
* as the author of the parts of the library used.
549-
* This can be in the form of a textual message at program startup or
550-
* in documentation (online or textual) provided with the package.
551-
*
552-
* Redistribution and use in source and binary forms, with or without
553-
* modification, are permitted provided that the following conditions
554-
* are met:
555-
* 1. Redistributions of source code must retain the copyright
556-
* notice, this list of conditions and the following disclaimer.
557-
* 2. Redistributions in binary form must reproduce the above copyright
558-
* notice, this list of conditions and the following disclaimer in the
559-
* documentation and/or other materials provided with the distribution.
560-
* 3. All advertising materials mentioning features or use of this software
561-
* must display the following acknowledgement:
562-
* "This product includes cryptographic software written by
563-
* Eric Young ([email protected])"
564-
* The word 'cryptographic' can be left out if the rouines from the library
565-
* being used are not cryptographic related :-).
566-
* 4. If you include any Windows specific code (or a derivative thereof) from
567-
* the apps directory (application code) you must include an acknowledgement:
568-
* "This product includes software written by Tim Hudson ([email protected])"
569-
*
570-
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG `+"``"+`AS IS'' AND
571-
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
572-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
573-
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
574-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
575-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
576-
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
577-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
578-
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
579-
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
580-
* SUCH DAMAGE.
484+
fmt.Fprintf(&b, `/*
485+
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
581486
*
582-
* The licence and distribution terms for any publically available version or
583-
* derivative of this code cannot be changed. i.e. this code cannot simply be
584-
* copied and put under another distribution licence
585-
* [including the GNU Public Licence.] */
487+
* Licensed under the OpenSSL license (the "License"). You may not use
488+
* this file except in compliance with the License. You can obtain a copy
489+
* in the file LICENSE in the source distribution or at
490+
* https://www.openssl.org/source/license.html
491+
*/
586492
587493
/* This file is generated by crypto/obj/objects.go. */
588494

0 commit comments

Comments
 (0)