Explicitly mention PKCS5_PBKDF2_HMAC in EVP doc.

[openssl.git] / crypto / conf / cnf_save.c

diff --git a/crypto/conf/cnf_save.c b/crypto/conf/cnf_save.c
index c9018de10ec76468faebfbd9acc2516225902b3d..71c4317428ff3402c504bd9be5ccb2c54723af79 100644 (file)
--- a/crypto/conf/cnf_save.c
+++ b/crypto/conf/cnf_save.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -57,50 +57,48 @@
  */
 
 #include <stdio.h>
-#include "conf.h"
+#include <openssl/conf.h>
 
-void print_conf(CONF_VALUE *cv);
+static void print_conf(CONF_VALUE *cv);
+static IMPLEMENT_LHASH_DOALL_FN(print_conf, CONF_VALUE *);
 
 main()
-       {
-       LHASH *conf;
-       long l;
-
-       conf=CONF_load(NULL,"../../apps/ssleay.cnf",&l);
-       if (conf == NULL)
-               {
-               fprintf(stderr,"error loading config, line %ld\n",l);
-               exit(1);
-               }
+{
+    LHASH *conf;
+    long l;
 
-       lh_doall(conf,print_conf);
-       }
+    conf = CONF_load(NULL, "../../apps/openssl.cnf", &l);
+    if (conf == NULL) {
+        fprintf(stderr, "error loading config, line %ld\n", l);
+        exit(1);
+    }
 
+    lh_doall(conf, LHASH_DOALL_FN(print_conf));
+}
 
-void print_conf(cv)
-CONF_VALUE *cv;
-       {
-       int i;
-       CONF_VALUE *v;
-       char *section;
-       char *name;
-       char *value;
-       STACK *s;
+static void print_conf(CONF_VALUE *cv)
+{
+    int i;
+    CONF_VALUE *v;
+    char *section;
+    char *name;
+    char *value;
+    STACK *s;
 
-       /* If it is a single entry, return */
+    /* If it is a single entry, return */
 
-       if (cv->name != NULL) return;
+    if (cv->name != NULL)
+        return;
 
-       printf("[ %s ]\n",cv->section);
-       s=(STACK *)cv->value;
+    printf("[ %s ]\n", cv->section);
+    s = (STACK *) cv->value;
 
-       for (i=0; i<sk_num(s); i++)
-               {
-               v=(CONF_VALUE *)sk_value(s,i);
-               section=(v->section == NULL)?"None":v->section;
-               name=(v->name == NULL)?"None":v->name;
-               value=(v->value == NULL)?"None":v->value;
-               printf("%s=%s\n",name,value);
-               }
-       printf("\n");
-       }
+    for (i = 0; i < sk_num(s); i++) {
+        v = (CONF_VALUE *)sk_value(s, i);
+        section = (v->section == NULL) ? "None" : v->section;
+        name = (v->name == NULL) ? "None" : v->name;
+        value = (v->value == NULL) ? "None" : v->value;
+        printf("%s=%s\n", name, value);
+    }
+    printf("\n");
+}