[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  c32bdbf171ce6650ef045ec47b5abe0de7c264db (commit)
      from  82f31fe4dd0dac30229fa8684229b49d2bcef404 (commit)


- Log -----------------------------------------------------------------
commit c32bdbf171ce6650ef045ec47b5abe0de7c264db
Author: Rich Salz <rsalz at openssl.org>
Date:   Sat Jun 25 22:08:21 2016 -0400

    Revert "RT2964: Fix it via doc"
    
    This reverts commit 82f31fe4dd0dac30229fa8684229b49d2bcef404.
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 doc/crypto/OBJ_nid2obj.pod | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/doc/crypto/OBJ_nid2obj.pod b/doc/crypto/OBJ_nid2obj.pod
index 01f5c6e..9fa9e66 100644
--- a/doc/crypto/OBJ_nid2obj.pod
+++ b/doc/crypto/OBJ_nid2obj.pod
@@ -45,12 +45,6 @@ Deprecated:
 
 The ASN1 object utility functions process ASN1_OBJECT structures which are
 a representation of the ASN1 OBJECT IDENTIFIER (OID) type.
-For convenience, OID's are usually represented in source code as numeric
-identifiers, or B<NID>'s.  OpenSSL has an internal table of OID's that
-are generated when the library is built, and their corresponding NID's
-are available as define'd constants.  For the functions below, application
-code should treat all returned values -- OID's, NID's, or names -- as
-constants.
 
 OBJ_nid2obj(), OBJ_nid2ln() and OBJ_nid2sn() convert the NID B<n> to
 an ASN1_OBJECT structure, its long name and its short name respectively,
@@ -145,7 +139,6 @@ Create a new NID and initialize an object from it:
 
  int new_nid;
  ASN1_OBJECT *obj;
-
  new_nid = OBJ_create("1.2.3.4", "NewOID", "New Object Identifier");
 
  obj = OBJ_nid2obj(new_nid);
@@ -163,9 +156,6 @@ Instead B<buf> must point to a valid buffer and B<buf_len> should
 be set to a positive value. A buffer length of 80 should be more
 than enough to handle any OID encountered in practice.
 
-Many of the functions here should probably be changed to return B<const>
-pointers. But the lack of consistency makes that too awkward to do.
-
 =head1 RETURN VALUES
 
 OBJ_nid2obj() returns an B<ASN1_OBJECT> structure or B<NULL> is an