summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremaldona%redhat.com <devnull@localhost>2012-05-04 00:11:38 +0000
committeremaldona%redhat.com <devnull@localhost>2012-05-04 00:11:38 +0000
commit72525fff22fefc486ab9d91694571ef1cf17cedc (patch)
treecd3f183b872d41d55e20ad0a9c86e81a3da94f0f
parent15450634a645126f3150ae909d2b853b81dde1c9 (diff)
downloadnss-hg-72525fff22fefc486ab9d91694571ef1cf17cedc.tar.gz
Bug 744651 - remove duplicate declarations from headers, r=rrelyea
-rw-r--r--security/nss/cmd/lib/basicutil.h56
-rw-r--r--security/nss/cmd/lib/secutil.h2
2 files changed, 0 insertions, 58 deletions
diff --git a/security/nss/cmd/lib/basicutil.h b/security/nss/cmd/lib/basicutil.h
index 8a83bfcfc..576c4788c 100644
--- a/security/nss/cmd/lib/basicutil.h
+++ b/security/nss/cmd/lib/basicutil.h
@@ -12,8 +12,6 @@
#include "key.h"
#include "prerror.h"
#include "base64.h"
-#include "key.h"
-#include "secpkcs7.h"
#include "secasn1.h"
#include "secder.h"
#include <stdio.h>
@@ -64,14 +62,6 @@ extern void SECU_PrintDSAPublicKey(FILE *out, SECKEYPublicKey *pk, char *m, int
extern int SECU_PrintPrivateKey(FILE *out, SECItem *der, char *m, int level);
#endif
-/* Print the MD5 and SHA1 fingerprints of a cert */
-extern int SECU_PrintFingerprints(FILE *out, SECItem *derCert, char *m,
- int level);
-
-/* Pretty-print any PKCS7 thing */
-extern int SECU_PrintPKCS7ContentInfo(FILE *out, SECItem *der, char *m,
- int level);
-
/* Init PKCS11 stuff */
extern SECStatus SECU_PKCS11Init(PRBool readOnly);
@@ -79,51 +69,11 @@ extern SECStatus SECU_PKCS11Init(PRBool readOnly);
extern int SECU_PrintSignedData(FILE *out, SECItem *der, const char *m,
int level, SECU_PPFunc inner);
-/* Print cert data and its trust flags */
-extern SECStatus SEC_PrintCertificateAndTrust(CERTCertificate *cert,
- const char *label,
- CERTCertTrust *trust);
-
-extern int SECU_PrintCrl(FILE *out, SECItem *der, char *m, int level);
-
-extern void
-SECU_PrintCRLInfo(FILE *out, CERTCrl *crl, char *m, int level);
-
extern void SECU_PrintString(FILE *out, SECItem *si, char *m, int level);
extern void SECU_PrintAny(FILE *out, SECItem *i, char *m, int level);
-extern void SECU_PrintPolicy(FILE *out, SECItem *value, char *msg, int level);
-extern void SECU_PrintPrivKeyUsagePeriodExtension(FILE *out, SECItem *value,
- char *msg, int level);
-
-extern void SECU_PrintExtensions(FILE *out, CERTCertExtension **extensions,
- char *msg, int level);
-
-extern void SECU_PrintNameQuotesOptional(FILE *out, CERTName *name,
- const char *msg, int level,
- PRBool quotes);
-extern void SECU_PrintName(FILE *out, CERTName *name, const char *msg,
- int level);
-extern void SECU_PrintRDN(FILE *out, CERTRDN *rdn, const char *msg, int level);
-
-#ifdef SECU_GetPassword
-/* Convert a High public Key to a Low public Key */
-extern SECKEYLowPublicKey *SECU_ConvHighToLow(SECKEYPublicKey *pubHighKey);
-#endif
-
-extern char *SECU_GetModulePassword(PK11SlotInfo *slot, PRBool retry, void *arg);
-
-extern SECStatus DER_PrettyPrint(FILE *out, SECItem *it, PRBool raw);
-
-extern char *SECU_SECModDBName(void);
-
extern void SECU_PrintPRandOSError(char *progName);
-extern SECStatus SECU_RegisterDynamicOids(void);
-
-/* Identifies hash algorithm tag by its string representation. */
-extern SECOidTag SECU_StringToSignatureAlgTag(const char *alg);
-
/* Caller ensures that dst is at least item->len*2+1 bytes long */
void
SECU_SECItemToHex(const SECItem * item, char * dst);
@@ -177,12 +127,6 @@ void printflags(char *trusts, unsigned int flags);
extern int ffs(unsigned int i);
#endif
-/* Finds certificate by searching it in the DB or by examinig file
- * in the local directory. */
-CERTCertificate*
-SECU_FindCertByNicknameOrFilename(CERTCertDBHandle *handle,
- char *name, PRBool ascii,
- void *pwarg);
#include "secerr.h"
extern const char *hex;
diff --git a/security/nss/cmd/lib/secutil.h b/security/nss/cmd/lib/secutil.h
index 16c4aba88..02598dda0 100644
--- a/security/nss/cmd/lib/secutil.h
+++ b/security/nss/cmd/lib/secutil.h
@@ -278,8 +278,6 @@ extern SECStatus DER_PrettyPrint(FILE *out, SECItem *it, PRBool raw);
extern char *SECU_SECModDBName(void);
-extern void SECU_PrintPRandOSError(char *progName);
-
extern SECStatus SECU_RegisterDynamicOids(void);
/* Identifies hash algorithm tag by its string representation. */