diff options
| author | wtc%netscape.com <devnull@localhost> | 2001-01-05 02:18:55 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2001-01-05 02:18:55 +0000 |
| commit | 164dd3025f223ab36ac38e46988d2e49185deaf6 (patch) | |
| tree | d8c02f521a054e72fe4731e639f0842239b920e9 | |
| parent | 2c37abab0f2d147bcccec46f9d6e2dd71aec2b94 (diff) | |
| download | nss-hg-164dd3025f223ab36ac38e46988d2e49185deaf6.tar.gz | |
Bugzilla bug #64261: moved certread.c from lib/certhigh to lib/pkcs7.
As a result of this move I have to export one more data symbol
(SECAnyTemplate) from libnss3.so. :( Removed the temporary workaround
in coreconf/rules.mk.
Modified Files:
coreconf/rules.mk nss/lib/certhigh/manifest.mn
nss/lib/nss/mapfile nss/lib/nss/nss.def
nss/lib/pkcs7/manifest.mn
Added Files:
nss/lib/pkcs7/certread.c
Removed Files:
nss/lib/certhigh/certread.c
| -rw-r--r-- | security/coreconf/rules.mk | 14 | ||||
| -rw-r--r-- | security/nss/lib/certhigh/manifest.mn | 1 | ||||
| -rw-r--r-- | security/nss/lib/nss/mapfile | 1 | ||||
| -rw-r--r-- | security/nss/lib/nss/nss.def | 1 | ||||
| -rw-r--r-- | security/nss/lib/pkcs7/certread.c (renamed from security/nss/lib/certhigh/certread.c) | 0 | ||||
| -rw-r--r-- | security/nss/lib/pkcs7/manifest.mn | 1 |
6 files changed, 4 insertions, 14 deletions
diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk index c0391809b..d1bd651b3 100644 --- a/security/coreconf/rules.mk +++ b/security/coreconf/rules.mk @@ -303,20 +303,8 @@ ifneq ($(POLICY),) -$(PLCYPATCH) $(PLCYPATCH_ARGS) $@ endif -# -# XXX temporary workaround for Bugzilla bug #64261. -# We can't put certread.o in libnss3.so because certread.o -# depends on some PKCS7 symbols in libsmime3.so, which -# would create a circular dependency between libnss3.so and -# libsmime3.so. -# -# The original get_objs rule is: -# -#get_objs: -# @echo $(OBJS) -# get_objs: - @echo $(filter-out $(OBJDIR)/certread$(OBJ_SUFFIX),$(OBJS)) + @echo $(OBJS) $(LIBRARY): $(OBJS) @$(MAKE_OBJDIR) diff --git a/security/nss/lib/certhigh/manifest.mn b/security/nss/lib/certhigh/manifest.mn index 260a3e258..d7d0a2247 100644 --- a/security/nss/lib/certhigh/manifest.mn +++ b/security/nss/lib/certhigh/manifest.mn @@ -45,7 +45,6 @@ MODULE = security CSRCS = \ certhtml.c \ - certread.c \ certreq.c \ crlv2.c \ ocsp.c \ diff --git a/security/nss/lib/nss/mapfile b/security/nss/lib/nss/mapfile index 27594853d..21f328fdd 100644 --- a/security/nss/lib/nss/mapfile +++ b/security/nss/lib/nss/mapfile @@ -789,6 +789,7 @@ NSS_3.2 { # NSS 3.2 release RSA_PublicKeyOp; RSA_Sign; RSA_SignRaw; + SECAnyTemplate; SECITEM_AllocItem; SECITEM_CompareItem; SECITEM_CopyItem; diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def index 3877972fb..3d99adc27 100644 --- a/security/nss/lib/nss/nss.def +++ b/security/nss/lib/nss/nss.def @@ -788,6 +788,7 @@ RSA_PrivateKeyOp RSA_PublicKeyOp RSA_Sign RSA_SignRaw +SECAnyTemplate SECITEM_AllocItem SECITEM_CompareItem SECITEM_CopyItem diff --git a/security/nss/lib/certhigh/certread.c b/security/nss/lib/pkcs7/certread.c index 5c5ddab78..5c5ddab78 100644 --- a/security/nss/lib/certhigh/certread.c +++ b/security/nss/lib/pkcs7/certread.c diff --git a/security/nss/lib/pkcs7/manifest.mn b/security/nss/lib/pkcs7/manifest.mn index b2b0e45d9..64cc3e05f 100644 --- a/security/nss/lib/pkcs7/manifest.mn +++ b/security/nss/lib/pkcs7/manifest.mn @@ -46,6 +46,7 @@ PRIVATE_EXPORTS = \ MODULE = security CSRCS = \ + certread.c \ p7common.c \ p7create.c \ p7decode.c \ |