Skip to content

Commit a97eabc

Browse files
author
beck
committed
Add back the fips mode test functions, new stuff requires this.
Symbols.list changes to follow with tb's upcoming bump ok jsing@
1 parent 2380a81 commit a97eabc

File tree

3 files changed

+83
-3
lines changed

3 files changed

+83
-3
lines changed

‎src/lib/libcrypto/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $OpenBSD: Makefile,v 1.46 2021/09/03 23:30:42 job Exp $
1+
# $OpenBSD: Makefile,v 1.47 2021/10/23 09:13:51 beck Exp $
22

33
LIB= crypto
44
LIBREBUILD=y
@@ -41,7 +41,7 @@ SYMBOL_LIST= ${.CURDIR}/Symbols.list
4141

4242
# crypto/
4343
SRCS+= cryptlib.c malloc-wrapper.c mem_dbg.c cversion.c ex_data.c cpt_err.c
44-
SRCS+= o_time.c o_str.c o_init.c
44+
SRCS+= o_time.c o_str.c o_init.c o_fips.c
4545
SRCS+= mem_clr.c crypto_init.c crypto_lock.c
4646

4747
# aes/

‎src/lib/libcrypto/crypto.h‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: crypto.h,v 1.50 2019/01/19 01:07:00 tb Exp $ */
1+
/* $OpenBSD: crypto.h,v 1.51 2021/10/23 09:13:51 beck Exp $ */
22
/* ====================================================================
33
* Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
44
*
@@ -505,6 +505,11 @@ uint64_t OPENSSL_cpu_caps(void);
505505
int OPENSSL_isservice(void);
506506

507507
#ifndef LIBRESSL_INTERNAL
508+
#if defined(LIBRESSL_NEW_API)
509+
int FIPS_mode(void);
510+
int FIPS_mode_set(int r);
511+
#endif
512+
508513
void OPENSSL_init(void);
509514

510515
/* CRYPTO_memcmp returns zero iff the |len| bytes at |a| and |b| are equal. It

‎src/lib/libcrypto/o_fips.c‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
/* Written by Stephen henson (steve@@openssl.org) for the OpenSSL
2+
* project 2011.
3+
*/
4+
/* ====================================================================
5+
* Copyright (c) 2011 The OpenSSL Project. All rights reserved.
6+
*
7+
* Redistribution and use in source and binary forms, with or without
8+
* modification, are permitted provided that the following conditions
9+
* are met:
10+
*
11+
* 1. Redistributions of source code must retain the above copyright
12+
* notice, this list of conditions and the following disclaimer.
13+
*
14+
* 2. Redistributions in binary form must reproduce the above copyright
15+
* notice, this list of conditions and the following disclaimer in
16+
* the documentation and/or other materials provided with the
17+
* distribution.
18+
*
19+
* 3. All advertising materials mentioning features or use of this
20+
* software must display the following acknowledgment:
21+
* "This product includes software developed by the OpenSSL Project
22+
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
23+
*
24+
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
25+
* endorse or promote products derived from this software without
26+
* prior written permission. For written permission, please contact
27+
* openssl-core@@openssl.org.
28+
*
29+
* 5. Products derived from this software may not be called "OpenSSL"
30+
* nor may "OpenSSL" appear in their names without prior written
31+
* permission of the OpenSSL Project.
32+
*
33+
* 6. Redistributions of any form whatsoever must retain the following
34+
* acknowledgment:
35+
* "This product includes software developed by the OpenSSL Project
36+
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
37+
*
38+
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
39+
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
40+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
41+
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
42+
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
43+
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
44+
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
45+
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
46+
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
47+
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
48+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
49+
* OF THE POSSIBILITY OF SUCH DAMAGE.
50+
* ====================================================================
51+
*
52+
* This product includes cryptographic software written by Eric Young
53+
* (eay@@cryptsoft.com). This product includes software written by Tim
54+
* Hudson (tjh@@cryptsoft.com).
55+
*
56+
*/
57+
58+
#include <openssl/err.h>
59+
60+
#include "cryptlib.h"
61+
62+
int
63+
FIPS_mode(void)
64+
{
65+
return 0;
66+
}
67+
68+
int
69+
FIPS_mode_set(int r)
70+
{
71+
if (r == 0)
72+
return 1;
73+
CRYPTOerror(CRYPTO_R_FIPS_MODE_NOT_SUPPORTED);
74+
return 0;
75+
}

0 commit comments

Comments
 (0)