projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure we get all the right defines for AES assembler in FIPS module
[openssl.git]
/
crypto
/
sparcv9cap.c
diff --git
a/crypto/sparcv9cap.c
b/crypto/sparcv9cap.c
index c8c567536b33d78cedf4c650cebc64b84ee62b05..e48ebf7e6dfc74df1f68c273d503f766e72c08a2 100644
(file)
--- a/
crypto/sparcv9cap.c
+++ b/
crypto/sparcv9cap.c
@@
-1,7
+1,7
@@
/*
* Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved.
*
/*
* Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved.
*
- * Licensed under the
OpenSSL license
(the "License"). You may not use
+ * Licensed under the
Apache License 2.0
(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
* 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
@@
-24,6
+24,11
@@
__attribute__ ((visibility("hidden")))
#endif
unsigned int OPENSSL_sparcv9cap_P[2] = { SPARCV9_TICK_PRIVILEGED, 0 };
#endif
unsigned int OPENSSL_sparcv9cap_P[2] = { SPARCV9_TICK_PRIVILEGED, 0 };
+/*
+ * TODO(3.0): Temporarily disabled some assembler that hasn't been brought into
+ * the FIPS module yet.
+ */
+#ifndef FIPS_MODE
int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
const BN_ULONG *np, const BN_ULONG *n0, int num)
{
int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
const BN_ULONG *np, const BN_ULONG *n0, int num)
{
@@
-86,6
+91,7
@@
int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
}
return bn_mul_mont_int(rp, ap, bp, np, n0, num);
}
}
return bn_mul_mont_int(rp, ap, bp, np, n0, num);
}
+#endif /* FIPS_MODE */
unsigned long _sparcv9_rdtick(void);
void _sparcv9_vis1_probe(void);
unsigned long _sparcv9_rdtick(void);
void _sparcv9_vis1_probe(void);