[GitHub] [guacamole-server] mike-jumper commented on a diff in pull request #391: GUACAMOLE-1669: Prefer FIPS compliant ciphers and algorithms when FIPS mode is enabled.

[GitBox <gi...@apache.org>]

mike-jumper commented on code in PR #391:
URL: https://github.com/apache/guacamole-server/pull/391#discussion_r953408359


##########
src/libguac/fips.c:
##########
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include "config.h"
+#include "guacamole/fips.h"
+
+#ifdef ENABLE_SSL
+
+#include <openssl/opensslv.h>
+
+/* OpenSSL versions prior to 0.9.7e did not have FIPS support */
+#if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x00090705f)
+
+int guac_fips_enabled() {
+
+	return 0;
+
+}
+
+/* OpenSSL 3+ uses EVP_default_properties_is_fips_enabled() */
+#elif defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
+
+#include <openssl/evp.h>
+
+int guac_fips_enabled() {
+
+	return EVP_default_properties_is_fips_enabled(NULL);
+
+}
+
+/* For OpenSSL versions between 0.9.7e and 3.0, use FIPS_mode() */
+#else

Review Comment:
   I'm finding this somewhat hard to read, and I think that's in part because the frequency of empty lines makes this effectively double-spaced.
   
   I have some ideas that might clean things up a smidge:
   
   1. Nix the extra spacing within the one-line func:
   
      ```c
      int foo() {
          return 0;
      }
      ```
   
      or ...
   2. ... Leverage macros to avoid having to redeclare everything. For example:
   
      ```c
      #if thing1
      #include <foo.h>
      #define GUAC_FIPS_ENABLED EVP_default_properties_is_fips_enabled(NULL)
      #elif thing2
      #include <bar.h>
      #define GUAC_FIPS_ENABLED FIPS_mode()
      #else
      #define GUAC_FIPS_ENABLED 0
      #endif
   
      int guac_fips_enabled() {
          return GUAC_FIPS_ENABLED;
      }
   
      ```



##########
src/libguac/fips.c:
##########
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include "config.h"
+#include "guacamole/fips.h"
+
+#ifdef ENABLE_SSL
+
+#include <openssl/opensslv.h>
+
+/* OpenSSL versions prior to 0.9.7e did not have FIPS support */
+#if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x00090705f)
+
+int guac_fips_enabled() {
+
+	return 0;
+
+}
+
+/* OpenSSL 3+ uses EVP_default_properties_is_fips_enabled() */
+#elif defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
+
+#include <openssl/evp.h>
+
+int guac_fips_enabled() {
+
+	return EVP_default_properties_is_fips_enabled(NULL);

Review Comment:
   Beware tabs have snuck in.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscribe@guacamole.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org