Remove NOPROTO definitions and error code comments.

[oweals/openssl.git] / crypto / asn1 / p5_pbe.c

diff --git a/crypto/asn1/p5_pbe.c b/crypto/asn1/p5_pbe.c
index b0de0d843b8a20117c63cdf77deb5b9e2e0c8825..c7a3ecf9fbe49c7aa482502599ebae4950a75861 100644 (file)
--- a/crypto/asn1/p5_pbe.c
+++ b/crypto/asn1/p5_pbe.c
@@ -58,18 +58,13 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1_mac.h"
-#include "rand.h"
+#include <openssl/asn1_mac.h>
+#include <openssl/rand.h>
 
 /* PKCS#5 password based encryption structure */
 
 #define PKCS5_SALT_LEN 8
 
-/*
- *ASN1err(ASN1_F_PBEPARAM_NEW,ASN1_R_DECODE_ERROR)
- *ASN1err(ASN1_F_D2I_PBEPARAM,ASN1_R_DECODE_ERROR)
- */
-
 int i2d_PBEPARAM(PBEPARAM *a, unsigned char **pp)
 {
        M_ASN1_I2D_vars(a);