Update OpenSSL to 1.0.1b.

[ffftp/ffftp.git] / contrib / openssl / include / openssl / dsa.h

diff --git a/contrib/openssl/include/openssl/dsa.h b/contrib/openssl/include/openssl/dsa.h
index 60fb7b5..40d2663 100644 (file)
--- a/contrib/openssl/include/openssl/dsa.h
+++ b/contrib/openssl/include/openssl/dsa.h
@@ -97,6 +97,21 @@
                                               * be used for all exponents.\r
                                               */\r
 \r
+/* If this flag is set the DSA method is FIPS compliant and can be used\r
+ * in FIPS mode. This is set in the validated module method. If an\r
+ * application sets this flag in its own methods it is its reposibility\r
+ * to ensure the result is compliant.\r
+ */\r
+\r
+#define DSA_FLAG_FIPS_METHOD                   0x0400\r
+\r
+/* If this flag is set the operations normally disabled in FIPS mode are\r
+ * permitted it is then the applications responsibility to ensure that the\r
+ * usage is compliant.\r
+ */\r
+\r
+#define DSA_FLAG_NON_FIPS_ALLOW                        0x0400\r
+\r
 #ifdef  __cplusplus\r
 extern "C" {\r
 #endif\r
@@ -272,6 +287,8 @@ void ERR_load_DSA_strings(void);
 #define DSA_F_DSAPARAMS_PRINT_FP                        101\r
 #define DSA_F_DSA_DO_SIGN                               112\r
 #define DSA_F_DSA_DO_VERIFY                             113\r
+#define DSA_F_DSA_GENERATE_KEY                          124\r
+#define DSA_F_DSA_GENERATE_PARAMETERS_EX                123\r
 #define DSA_F_DSA_NEW_METHOD                            103\r
 #define DSA_F_DSA_PARAM_DECODE                          119\r
 #define DSA_F_DSA_PRINT_FP                              105\r
@@ -282,6 +299,7 @@ void ERR_load_DSA_strings(void);
 #define DSA_F_DSA_SIGN                                  106\r
 #define DSA_F_DSA_SIGN_SETUP                            107\r
 #define DSA_F_DSA_SIG_NEW                               109\r
+#define DSA_F_DSA_SIG_PRINT                             125\r
 #define DSA_F_DSA_VERIFY                                108\r
 #define DSA_F_I2D_DSA_SIG                               111\r
 #define DSA_F_OLD_DSA_PRIV_DECODE                       122\r
@@ -298,6 +316,8 @@ void ERR_load_DSA_strings(void);
 #define DSA_R_INVALID_DIGEST_TYPE                       106\r
 #define DSA_R_MISSING_PARAMETERS                        101\r
 #define DSA_R_MODULUS_TOO_LARGE                                 103\r
+#define DSA_R_NEED_NEW_SETUP_VALUES                     110\r
+#define DSA_R_NON_FIPS_DSA_METHOD                       111\r
 #define DSA_R_NO_PARAMETERS_SET                                 107\r
 #define DSA_R_PARAMETER_ENCODING_ERROR                  105\r
 \r