X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=test%2Fossl_shim%2Fpacketed_bio.cc;h=450baeccdf22a9b86738cbe121c6e562fead1890;hp=74d8ab51a09eb708eaf1c14df633f5c25299cfaa;hb=eefc485bda4ab1ac7293b4c749c251b662d9fba8;hpb=fc237de7ff4886c0d58300051ea4325e10b6943f diff --git a/test/ossl_shim/packeted_bio.cc b/test/ossl_shim/packeted_bio.cc index 74d8ab51a0..450baeccdf 100644 --- a/test/ossl_shim/packeted_bio.cc +++ b/test/ossl_shim/packeted_bio.cc @@ -1,16 +1,11 @@ -/* Copyright (c) 2014, Google Inc. +/* + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + * 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 + */ #include "packeted_bio.h" @@ -245,10 +240,10 @@ static int PacketedFree(BIO *bio) { return 1; } -static long PacketedCallbackCtrl(BIO *bio, int cmd, bio_info_cb fp) { - if (BIO_next(bio) == NULL) { +static long PacketedCallbackCtrl(BIO *bio, int cmd, BIO_info_cb fp) +{ + if (BIO_next(bio) == NULL) return 0; - } return BIO_callback_ctrl(BIO_next(bio), cmd, fp); }