merged the modularization branch (credentials) back to trunk

2008-03-13 14:14:44 +00:00
parent 2df655134c
commit 552cc11b1f
495 changed files with 30378 additions and 23843 deletions
@@ -21,7 +21,7 @@

 err_t pem_to_bin(chunk_t *blob, chunk_t *passphrase, bool *pgp);

-bool pem_asn1_load_file(const char *filename, chunk_t *passphrase,
-						const char *type, chunk_t *blob, bool *pgp);
+bool pem_asn1_load_file(char *filename, chunk_t *passphrase,
+						chunk_t *blob, bool *pgp);

-#endif /*PEM_H_*/
+#endif /*PEM_H_ @} */